Ignore archived subprojects in Project#rolled_up_trackers (#2550).

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

Ignore archived subprojects in Project#rolled_up_trackers (#2550).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2311 e93f8b46-1217-0410-a6f0-8f06a7374b81
90c742e4 · Jean-Philippe Lang · 97e31c40 · 90c742e4 · 90c742e4
Commit 90c742e4 authored Jan 25, 2009 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 2 deletions

project.rb app/models/project.rb +2 -2

project_test.rb test/unit/project_test.rb +10 -0

No files found.
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -225,12 +225,12 @@ class Project < ActiveRecord::Base
    end
  end
  
-  # Returns an array of the trackers used by the project and its sub projects
+  # 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, :include => :projects,
                         :select => "DISTINCT #{Tracker.table_name}.*",
-                         :conditions => ["#{Project.table_name}.lft >= ? AND #{Project.table_name}.rgt <= ?", lft, rgt],
+                         :conditions => ["#{Project.table_name}.lft >= ? AND #{Project.table_name}.rgt <= ? AND #{Project.table_name}.status = #{STATUS_ACTIVE}", lft, rgt],
                         :order => "#{Tracker.table_name}.position")
  end
  

--- a/test/unit/project_test.rb
+++ b/test/unit/project_test.rb
@@ -198,6 +198,16 @@ class ProjectTest < Test::Unit::TestCase
    assert_equal [2, 3], child.rolled_up_trackers.collect(&:id)
  end
  
+  def test_rolled_up_trackers_should_ignore_archived_subprojects
+    parent = Project.find(1)
+    parent.trackers = Tracker.find([1,2])
+    child = parent.children.find(3)
+    child.trackers = Tracker.find([1,3])
+    parent.children.each(&:archive)
+    
+    assert_equal [1,2], parent.rolled_up_trackers.collect(&:id)
+  end
+  
  def test_next_identifier
    ProjectCustomField.delete_all
    Project.create!(:name => 'last', :identifier => 'p2008040')