Merge pull request refinery#1530 from resolve/f/multi-image

Actually allow multiple to be set via url param.
ChasManRors · Mar 29, 2012 · fb0bf98 · fb0bf98
2 parents 2f8c1aa + 778bf86
commit fb0bf98
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/images/app/controllers/refinery/admin/images_controller.rb b/images/app/controllers/refinery/admin/images_controller.rb
@@ -84,6 +84,7 @@ def init_dialog
         @update_image = params[:update_image]
         @thumbnail = params[:thumbnail]
         @callback = params[:callback]
+        @multiple = params[:multiple]
         @conditions = params[:conditions]
       end
 

diff --git a/images/app/views/refinery/admin/images/insert.html.erb b/images/app/views/refinery/admin/images/insert.html.erb
@@ -38,7 +38,10 @@
 <% content_for :javascripts do %>
   <script>
     $(document).ready(function(){
-      new ImageDialog({callback: <%= @callback.present? ? "self.parent.#{@callback}" : "null" %>, multiple: false}).create();
+      new ImageDialog({
+        callback: <%= @callback.present? ? "self.parent.#{h @callback}" : "null" %>, 
+        multiple: <%= @multiple == true %>
+      }).create();
     });
   </script>
 <% end %>