From 560eb039f4778257559395583e1233d052d44127 Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Tue, 20 May 2014 13:50:32 +0200
Subject: flash_for with_errors option displays error messages

---
 app/controllers/controller_extension/flash.rb         | 18 ++++++++++++++----
 engines/support/app/controllers/tickets_controller.rb |  2 +-
 engines/support/app/views/tickets/edit.html.haml      |  1 +
 3 files changed, 16 insertions(+), 5 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
diff --git a/engines/support/app/controllers/tickets_controller.rb b/engines/support/app/controllers/tickets_controller.rb
index 7b6a7a0..9c1a741 100644
--- a/engines/support/app/controllers/tickets_controller.rb
+++ b/engines/support/app/controllers/tickets_controller.rb
@@ -62,7 +62,7 @@ class TicketsController < ApplicationController
       @ticket.comments.last.private = false unless admin?
     end
 
-    flash_for @ticket
+    flash_for @ticket, with_errors: true
     @ticket.save
     respond_with @ticket, location: redirection_path
   end
diff --git a/engines/support/app/views/tickets/edit.html.haml b/engines/support/app/views/tickets/edit.html.haml
index 99afa2a..03bda7d 100644
--- a/engines/support/app/views/tickets/edit.html.haml
+++ b/engines/support/app/views/tickets/edit.html.haml
@@ -1,4 +1,5 @@
 - @show_navigation = params[:user_id].present?
+- @comment = TicketComment.new
 
 .ticket
   = render 'tickets/edit_form'
-- 
cgit v1.2.3