[PATCH 3/3] BZ 801911 added checks before destroying a pool family

Tzu-Mainn Chen tzumainn at redhat.com
Wed Mar 14 14:55:00 UTC 2012


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

diff --git a/src/app/controllers/pool_families_controller.rb b/src/app/controllers/pool_families_controller.rb
index 0a4f2d5..ee74d96 100644
--- a/src/app/controllers/pool_families_controller.rb
+++ b/src/app/controllers/pool_families_controller.rb
@@ -95,11 +95,14 @@ class PoolFamiliesController < ApplicationController
   def destroy
     pool_family = PoolFamily.find(params[:id])
     require_privilege(Privilege::MODIFY, pool_family)
-    if pool_family.destroy
+    if pool_family == PoolFamily.default
+      flash[:error] = t("pool_families.flash.error.default_pool_family_not_deleted")
+    elsif pool_family.destroy
       flash[:notice] = t "pool_families.flash.notice.deleted"
     else
       flash[:error] = t "pool_families.flash.error.not_deleted"
     end
+
     redirect_to pool_families_path
   end
 
-- 
1.7.6.5




More information about the aeolus-devel mailing list