Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Revert "When uploading images directly from /refinery/images/new redi…

…rect back to /refinery/images."

This reverts commit 9e0573a.

Conflicts:
	images/app/controllers/refinery/admin/images_controller.rb
  • Loading branch information...
commit 2630dc6cf91e1497bd927cbdabd12ed62567fec5 1 parent 9724a06
@ugisozols ugisozols authored
Showing with 3 additions and 3 deletions.
  1. +3 −3 images/app/assets/javascript/refinery/images.js.coffee.erb
View
6 images/app/assets/javascript/refinery/images.js.coffee.erb
@@ -19,6 +19,7 @@ class Images
cache_dom: ->
@error_list = $("#error_list")
+ @success_list = $("#flash")
@error_explanation = $("#errorExplanation")
@upload_progress = $("#upload_progress")
@@ -43,15 +44,14 @@ 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 if getParameterByName("dialog") == "true"
- window.parent.location.reload(true)
else
- window.location = "<%= Refinery::Core::Engine.routes.url_helpers.admin_images_path %>"
+ window.parent.location.reload(true)
validate: (file) ->
max_file_size = <%= Refinery::Images.max_image_size %>
Please sign in to comment.
Something went wrong with that request. Please try again.