summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/controller_extension/flash.rb18
1 files changed, 14 insertions, 4 deletions
diff --git a/app/controllers/controller_extension/flash.rb b/app/controllers/controller_extension/flash.rb
index 6a62351..8bc9ee7 100644
--- a/app/controllers/controller_extension/flash.rb
+++ b/app/controllers/controller_extension/flash.rb
@@ -5,10 +5,15 @@ module ControllerExtension::Flash
def flash_for(resource, options = {})
return unless resource.changed?
+ add_flash_message_for resource
+ add_flash_errors_for resource if options[:with_errors]
+ end
+
+ def add_flash_message_for(resource)
message = flash_message_for(resource)
- type = flash_type(resource)
+ type = flash_type_for(resource)
if message.present?
- flash[type] = [message, flash[type]].join(' ')
+ flash[type] = message
end
end
@@ -22,12 +27,17 @@ module ControllerExtension::Flash
def flash_i18n_key(resource)
namespace = [action_name]
namespace += controller_path.split('/')
- namespace << flash_type(resource)
+ namespace << flash_type_for(resource)
namespace.join(".")
end
- def flash_type(resource)
+ def flash_type_for(resource)
resource.valid? ? :success : :error
end
+ def add_flash_errors_for(resource)
+ return if resource.valid?
+ flash[:error] += "<br/>"
+ flash[:error] += resource.errors.full_messages.join(". <br/>")
+ end
end