From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 20 Nov 2009 13:08:17 +0000 (+0000)
Subject: Load roles when loading project members.
X-Git-Tag: 0.9.0~183
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d73fb1fab89634b5e6d5aaf0ac012333c3db6c42;p=redmine.git

Load roles when loading project members.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3078 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/models/project.rb b/app/models/project.rb
index 34d033efa..410cb2154 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -26,7 +26,7 @@ class Project < ActiveRecord::Base
       find(:all, :conditions => {:active => true})
     end
   end
-  has_many :members, :include => :user, :conditions => "#{User.table_name}.type='User' AND #{User.table_name}.status=#{User::STATUS_ACTIVE}"
+  has_many :members, :include => [:user, :roles], :conditions => "#{User.table_name}.type='User' AND #{User.table_name}.status=#{User::STATUS_ACTIVE}"
   has_many :member_principals, :class_name => 'Member', 
                                :include => :principal,
                                :conditions => "#{Principal.table_name}.type='Group' OR (#{Principal.table_name}.type='User' AND #{Principal.table_name}.status=#{User::STATUS_ACTIVE})"