kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Moves Project#principals to a regular method. 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11608 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2013-03-12 18:07:37 +00:00
parent 248d983a7d
commit 3528343863
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/project.rb
View File

@ -34,7 +34,6 @@ class Project < ActiveRecord::Base
:include => :principal, :include => :principal,
:conditions => "#{Principal.table_name}.type='Group' OR (#{Principal.table_name}.type='User' AND #{Principal.table_name}.status=#{Principal::STATUS_ACTIVE})" :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 :users, :through => :members
has_many :principals, :through => :member_principals, :source => :principal
has_many :enabled_modules, :dependent => :delete_all has_many :enabled_modules, :dependent => :delete_all
has_and_belongs_to_many :trackers, :order => "#{Tracker.table_name}.position" has_and_belongs_to_many :trackers, :order => "#{Tracker.table_name}.position"
@ -215,6 +214,10 @@ class Project < ActiveRecord::Base
end end
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 # Returns the Systemwide and project specific activities
def activities(include_inactive=false) def activities(include_inactive=false)
if include_inactive if include_inactive
@ -287,6 +290,7 @@ class Project < ActiveRecord::Base
alias :base_reload :reload alias :base_reload :reload
def reload(*args) def reload(*args)
@principals = nil
@shared_versions = nil @shared_versions = nil
@rolled_up_versions = nil @rolled_up_versions = nil
@rolled_up_trackers = nil @rolled_up_trackers = nil