Fixed calculation of done_ratio of parent task with child having estimated_time at...

git-svn-id: http://svn.redmine.org/redmine/trunk@12745 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/models/issue.rb b/app/models/issue.rb
index 106b7e77b7f9336bd6fdba52b18a92dc7d78fe60..debb93124d90ce9522230729444bfeea967d4b90 100644 (file)
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -1355,7 +1355,7 @@ class Issue < ActiveRecord::Base
       unless Issue.use_status_for_done_ratio? && p.status && p.status.default_done_ratio
         leaves_count = p.leaves.count
         if leaves_count > 0
-          average = p.leaves.average(:estimated_hours).to_f
+          average = p.leaves.where("estimated_hours > 0").average(:estimated_hours).to_f
           if average == 0
             average = 1
           end

diff --git a/test/unit/issue_nested_set_test.rb b/test/unit/issue_nested_set_test.rb
index 8c40f895c0fcd64701ebc02a68816928f9a5d18f..4a41c49db5263a831ffcfd55b5df95d88783713c 100644 (file)
--- a/test/unit/issue_nested_set_test.rb
+++ b/test/unit/issue_nested_set_test.rb
@@ -368,6 +368,18 @@ class IssueNestedSetTest < ActiveSupport::TestCase
     assert_equal 100, parent.reload.done_ratio
   end
 
+  def test_done_ratio_of_parent_with_a_child_with_estimated_time_at_0_should_not_exceed_100
+    parent = Issue.generate!
+    Issue.generate!(:estimated_hours => 40, :parent_issue_id => parent.id)
+    Issue.generate!(:estimated_hours => 40, :parent_issue_id => parent.id)
+    Issue.generate!(:estimated_hours => 20, :parent_issue_id => parent.id)
+    Issue.generate!(:estimated_hours => 0, :parent_issue_id => parent.id)
+    parent.reload.children.each do |child|
+      child.update_attribute :status_id, 5
+    end
+    assert_equal 100, parent.reload.done_ratio
+  end
+
   def test_move_parent_updates_old_parent_attributes
     first_parent = Issue.generate!
     second_parent = Issue.generate!