[PATCH] BZ 773247 fix for empty message header

Tzu-Mainn Chen tzumainn at redhat.com
Wed Feb 8 14:53:39 UTC 2012


---
 src/app/controllers/deployables_controller.rb |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/app/controllers/deployables_controller.rb b/src/app/controllers/deployables_controller.rb
index 5fc1ea3..cf5c6b0 100644
--- a/src/app/controllers/deployables_controller.rb
+++ b/src/app/controllers/deployables_controller.rb
@@ -41,10 +41,11 @@ class DeployablesController < ApplicationController
       @deployable.name = @image.name
       @selected_catalogs = params[:catalog_id].to_a
       load_catalogs
-      flash[:error] = []
-      flash[:error] << t("deployables.flash.error.no_catalog_exists") if @catalogs.empty?
-      flash[:error] << t("deployables.flash.error.no_hwp_exists") if @hw_profiles.empty?
-      @save_disabled = !(flash[:error].empty?)
+      flasherr = []
+      flasherr << t("deployables.flash.error.no_catalog_exists") if @catalogs.empty?
+      flasherr << t("deployables.flash.error.no_hwp_exists") if @hw_profiles.empty?
+      @save_disabled = !(flasherr.empty?)
+      flash[:error] = flasherr if not flasherr.empty?
     elsif params[:catalog_id].present?
       @catalog = Catalog.find(params[:catalog_id])
       require_privilege(Privilege::MODIFY, @catalog)
-- 
1.7.6.5




More information about the aeolus-devel mailing list