Merge branch 'release/0.6.18.2'

ulmic · May 18, 2016 · 43a5dde · 43a5dde
2 parents 7133a57 + 9870f85
commit 43a5dde
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/app/controllers/web/admin/images_controller.rb b/app/controllers/web/admin/images_controller.rb
@@ -33,7 +33,7 @@ def update
     @image_form = ImageForm.find_with_model params[:id]
     @image_form.submit(params[:image])
     if @image_form.save
-      redirect_to edit_admin_image_path @image_form.model
+      redirect_to admin_image_path @image_form.model
     else
       choose_users
       render action: :edit

diff --git a/app/models/redirect_rule.rb b/app/models/redirect_rule.rb
@@ -1,6 +1,6 @@
 class RedirectRule < ActiveRecord::Base
   validates :old_path, presence: true,
-		  uniqueness: true
+		  uniqueness: { scope: :state }
   validates :redirect_to, presence: true
 
   extend Enumerize

diff --git a/app/views/layouts/web/admin/shared/_messages.html.haml b/app/views/layouts/web/admin/shared/_messages.html.haml
@@ -1,9 +1,11 @@
-- if object.errors.any?
+- if object.errors.any? || object.model.errors.any?
   .alert.alert-dismissible.alert-danger
     %h4= t('.some_errors_was_found')
     %ul
       - object.errors.full_messages.each do |message|
         %li= message
+      - object.model.errors.full_messages.each do |message|
+        %li= message
 - elsif form_after_save? && object_updated_less_minute_ago?(object)
   .alert.alert-dismissible.alert-success
     %h4= t('messages.record_saved_success')