[PATCH 2/3] BZ 801911 check that pools are destroyable before destroying a pool family

--- src/app/models/pool_family.rb | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/models/pool_family.rb b/src/app/models/pool_family.rb index 219245d..8f5ea24 100644 --- a/src/app/models/pool_family.rb +++ b/src/app/models/pool_family.rb @@ -62,8 +62,8 @@ class PoolFamily < ActiveRecord::Base end def destroyable? - # A PoolFamily is destroyable unless it is the default PoolFamily - self != PoolFamily.default + # A PoolFamily is destroyable if its pools are destroyable and it is not the default PoolFamily + pools.all? {|p| p.destroyable? } && self != PoolFamily.default end def all_providers_disabled? -- 1.7.6.5