Merge branch 'master' into interference_marketable_pages_active_record

refinery · Aug 8, 2018 · 52391e7 · 52391e7
2 parents bcd259b + 20f64eb
commit 52391e7
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/images/app/controllers/refinery/admin/images_controller.rb b/images/app/controllers/refinery/admin/images_controller.rb
@@ -125,7 +125,7 @@ def crop
             crop: render_to_string('/refinery/admin/images/_crop', layout: false, locals: { crop: cropped_image})
           }
         else
-          flash.error = ::I18n.t('refinery.admin.images.form.crop_error')
+          flash.now[:error] = ::I18n.t('refinery.admin.images.form.crop_error')
           render json: { message: ::I18n.t('refinery.admin.images.form.crop_error') }
         end
       end