Merge pull request #1904 from resolve/imajax

When uploading images directly from /refinery/images/new redirect back to /refinery/images
refinery · Aug 29, 2012 · f8061d9 · f8061d9
2 parents 559014a + 9e0573a
commit f8061d9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/images/app/assets/javascript/refinery/images.js.coffee.erb b/images/app/assets/javascript/refinery/images.js.coffee.erb
@@ -19,7 +19,6 @@ class Images
 
   cache_dom: ->
     @error_list = $("#error_list")
-    @success_list = $("#flash")
     @error_explanation = $("#errorExplanation")
     @upload_progress = $("#upload_progress")
 
@@ -44,14 +43,15 @@ class Images
   after_upload_all: ->
     $(".save-loader").hide()
     @upload_progress.hide()
-    @success_list.show()
     if @errors.length > 0
       @render_errors()
     else
       if getParameterByName("modal") == "true"
         window.parent.document.getElementById("dialog_frame").contentDocument.location.reload(true);
-      else
+      else if getParameterByName("dialog") == "true"
         window.parent.location.reload(true)
+      else
+        window.location = "<%= Refinery::Core::Engine.routes.url_helpers.admin_images_path %>"
 
   validate: (file) ->
     max_file_size = <%= Refinery::Images.max_image_size %>

diff --git a/images/app/controllers/refinery/admin/images_controller.rb b/images/app/controllers/refinery/admin/images_controller.rb
@@ -55,12 +55,10 @@ def create
         unless params[:insert]
           if @images.all?(&:valid?)
             flash.notice = t('uploaded_successfully', :scope => 'refinery.admin.images.form')
-            if from_dialog?
-              @dialog_successful = true
-              render :nothing => true, :layout => true
-            else
-              redirect_to refinery.admin_images_path
-            end
+
+            @dialog_successful = true if from_dialog?
+
+            render :nothing => true, :layout => true
           else
             self.new # important for dialogs
             render :action => 'new'