[myexperiment-hackers] [2707] trunk/app/controllers/workflows_controller.rb: Files were actually Tempfiles.

[noreply]

Revision

2707

Author

dtm

Date

2011-09-16 13:20:13 -0400 (Fri, 16 Sep 2011)

Log Message

Files were actually Tempfiles.

Modified Paths

• trunk/app/controllers/workflows_controller.rb

Diff

Modified: trunk/app/controllers/workflows_controller.rb (2706 => 2707)

--- trunk/app/controllers/workflows_controller.rb	2011-09-16 15:34:56 UTC (rev 2706)
+++ trunk/app/controllers/workflows_controller.rb	2011-09-16 17:20:13 UTC (rev 2707)
@@ -981,8 +981,15 @@
     # The dependency on file_column has been removed, but this code remains
     # disabled on Windows until it is confirmed as working.
     unless RUBY_PLATFORM =~ /mswin32/
-      if params[:workflow][:preview] and params[:workflow][:preview].kind_of?(File)
-        workflow_to_set.image = params[:workflow][:preview].read unless params[:workflow][:preview].stat.size<1
+      preview = params[:workflow][:preview]
+      if preview
+        preview_size = -1
+        if preview.kind_of?(File)
+          preview_size = preview.stat.size
+        elsif preview.kind_of?(StringIO) || preview.kind_of?(Tempfile)
+            preview_size = preview.size
+        end
+        workflow_to_set.image = preview.read if preview_size>0
       end
     end