[PATCH conductor] BZ790026-Deleting a provider with running instances does not show any message

Tomáš Hrčka thrcka at redhat.com
Tue Feb 28 09:06:34 UTC 2012


https://bugzilla.redhat.com/show_bug.cgi?id=790026
---
 src/app/controllers/providers_controller.rb       |    3 ++-
 src/app/views/layouts/_new_notification.html.haml |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/app/controllers/providers_controller.rb b/src/app/controllers/providers_controller.rb
index 0819b99..f57c243 100644
--- a/src/app/controllers/providers_controller.rb
+++ b/src/app/controllers/providers_controller.rb
@@ -32,7 +32,8 @@ class ProvidersController < ApplicationController
     respond_to do |format|
       format.html do
         if @providers.present?
-          redirect_to edit_provider_path(@provider), :notice => flash[:notice], :error => flash[:error]
+          flash.keep
+          redirect_to edit_provider_path(@provider)
         else
           render :action => :index
         end
diff --git a/src/app/views/layouts/_new_notification.html.haml b/src/app/views/layouts/_new_notification.html.haml
index 54ed324..e7a38b4 100644
--- a/src/app/views/layouts/_new_notification.html.haml
+++ b/src/app/views/layouts/_new_notification.html.haml
@@ -62,7 +62,7 @@
                     %li= [k, v.present? ? ": #{v}" : '']
                 -else
                   -flash[:error][:failures].each do |k, v|
-                    %li= [v]
+                    %li= [k,v]
               -else
                 -flash[:error].each do |e|
                   %li= e
-- 
1.7.1




More information about the aeolus-devel mailing list