diff options
| -rw-r--r-- | app/models/project.rb | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index d1d89636e..5a8ba855b 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -406,10 +406,12 @@ class Project < ActiveRecord::Base # Returns an array of the trackers used by the project and its active sub projects def rolled_up_trackers @rolled_up_trackers ||= - Tracker.find(:all, :joins => :projects, - :select => "DISTINCT #{Tracker.table_name}.*", - :conditions => ["#{Project.table_name}.lft >= ? AND #{Project.table_name}.rgt <= ? AND #{Project.table_name}.status <> #{STATUS_ARCHIVED}", lft, rgt], - :order => "#{Tracker.table_name}.position") + Tracker. + joins(:projects). + select("DISTINCT #{Tracker.table_name}.*"). + where("#{Project.table_name}.lft >= ? AND #{Project.table_name}.rgt <= ? AND #{Project.table_name}.status <> #{STATUS_ARCHIVED}", lft, rgt). + sorted. + all end # Closes open and locked project versions that are completed |