jro_apps/redmine Commit - r11379:6d20cfe831ae

33

has_many :member_principals, :class_name => 'Member',

33

has_many :member_principals, :class_name => 'Member',

34

:include => :principal,

34

:include => :principal,

35

:conditions => "#{Principal.table_name}.type='Group' OR (#{Principal.table_name}.type='User' AND #{Principal.table_name}.status=#{Principal::STATUS_ACTIVE})"

35

:conditions => "#{Principal.table_name}.type='Group' OR (#{Principal.table_name}.type='User' AND #{Principal.table_name}.status=#{Principal::STATUS_ACTIVE})"

36

has_many :users, :through => :members

37

36

38

has_many :enabled_modules, :dependent => :delete_all

37

has_many :enabled_modules, :dependent => :delete_all

39

has_and_belongs_to_many :trackers, :order => "#{Tracker.table_name}.position"

38

has_and_belongs_to_many :trackers, :order => "#{Tracker.table_name}.position"

218

@principals ||= Principal.active.joins(:members).where("#{Member.table_name}.project_id = ?", id).uniq

217

@principals ||= Principal.active.joins(:members).where("#{Member.table_name}.project_id = ?", id).uniq

219

end

218

end

220

219

220

def users

221

@users ||= User.active.joins(:members).where("#{Member.table_name}.project_id = ?", id).uniq

222

end

223

221

# Returns the Systemwide and project specific activities

224

# Returns the Systemwide and project specific activities

222

def activities(include_inactive=false)

225

def activities(include_inactive=false)

223

if include_inactive

226

if include_inactive

291

alias :base_reload :reload

294

alias :base_reload :reload

292

def reload(*args)

295

def reload(*args)

293

@principals = nil

296

@principals = nil

297

@users = nil

294

@shared_versions = nil

298

@shared_versions = nil

295

@rolled_up_versions = nil

299

@rolled_up_versions = nil

296

@rolled_up_trackers = nil

300

@rolled_up_trackers = nil

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

               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=#{Principal::STATUS_ACTIVE})"
-              has_many :users, :through => :members
               has_many :enabled_modules, :dependent => :delete_all
               has_and_belongs_to_many :trackers, :order => "#{Tracker.table_name}.position"
                 @principals ||= Principal.active.joins(:members).where("#{Member.table_name}.project_id = ?", id).uniq
               end
+              def users
+                @users ||= User.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
               alias :base_reload :reload
               def reload(*args)
                 @principals = nil
+                @users = nil
                 @shared_versions = nil
                 @rolled_up_versions = nil
                 @rolled_up_trackers = nil