From 3528343863eabf0ac02bf1ec7d29eed9e2845be9 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Tue, 12 Mar 2013 18:07:37 +0000 Subject: [PATCH] Moves Project#principals to a regular method. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11608 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/project.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/models/project.rb b/app/models/project.rb index 49fa9dcde..86af292b1 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -34,7 +34,6 @@ class Project < ActiveRecord::Base :include => :principal, :conditions => "#{Principal.table_name}.type='Group' OR (#{Principal.table_name}.type='User' AND #{Principal.table_name}.status=#{Principal::STATUS_ACTIVE})" has_many :users, :through => :members - has_many :principals, :through => :member_principals, :source => :principal has_many :enabled_modules, :dependent => :delete_all has_and_belongs_to_many :trackers, :order => "#{Tracker.table_name}.position" @@ -215,6 +214,10 @@ class Project < ActiveRecord::Base end end + def principals + @principals ||= Principal.active.joins(:members).where("#{Member.table_name}.project_id = ?", id).uniq + end + # Returns the Systemwide and project specific activities def activities(include_inactive=false) if include_inactive @@ -287,6 +290,7 @@ class Project < ActiveRecord::Base alias :base_reload :reload def reload(*args) + @principals = nil @shared_versions = nil @rolled_up_versions = nil @rolled_up_trackers = nil