Signed-off-by: Scott Seago <sseago(a)redhat.com>
---
src/app/models/pool.rb | 1 +
src/app/models/pool_family.rb | 4 ++++
src/app/models/user.rb | 1 +
3 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/app/models/pool.rb b/src/app/models/pool.rb
index ce36d7d..39fa489 100644
--- a/src/app/models/pool.rb
+++ b/src/app/models/pool.rb
@@ -41,6 +41,7 @@ class Pool < ActiveRecord::Base
text :name, :as => :code_substring
end
has_many :instances, :dependent => :destroy
+ has_many :deployments, :dependent => :destroy
belongs_to :quota
belongs_to :pool_family
diff --git a/src/app/models/pool_family.rb b/src/app/models/pool_family.rb
index 8d5c951..175f6ac 100644
--- a/src/app/models/pool_family.rb
+++ b/src/app/models/pool_family.rb
@@ -39,6 +39,10 @@ class PoolFamily < ActiveRecord::Base
has_many :pools, :dependent => :destroy
has_and_belongs_to_many :provider_accounts
+ has_many :permissions, :as => :permission_object, :dependent => :destroy,
+ :include => [:role],
+ :order => "permissions.id ASC"
+
validates_presence_of :name
validates_uniqueness_of :name
def self.default
diff --git a/src/app/models/user.rb b/src/app/models/user.rb
index 4d95adc..4d387e8 100644
--- a/src/app/models/user.rb
+++ b/src/app/models/user.rb
@@ -58,6 +58,7 @@ class User < ActiveRecord::Base
has_many :permissions
has_many :owned_instances, :class_name => "Instance", :foreign_key =>
"owner_id"
+ has_many :owned_deployments, :class_name => "Deployment", :foreign_key
=> "owner_id"
belongs_to :quota, :autosave => true
accepts_nested_attributes_for :quota
--
1.7.3.4
Show replies by date