kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Reverts r12669 and add a test for #15870. 

git-svn-id: http://svn.redmine.org/redmine/trunk@12739 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2014-01-30 22:18:07 +00:00
parent cb000a5d85
commit d5a9af54fa
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/models/issue.rb
View File

@ -1364,7 +1364,6 @@ class Issue < ActiveRecord::Base
"* (CASE WHEN is_closed = #{connection.quoted_true} THEN 100 ELSE COALESCE(done_ratio, 0) END)").to_f "* (CASE WHEN is_closed = #{connection.quoted_true} THEN 100 ELSE COALESCE(done_ratio, 0) END)").to_f
progress = done / (average * leaves_count) progress = done / (average * leaves_count)
p.done_ratio = progress.round p.done_ratio = progress.round
p.done_ratio = 100 if p.done_ratio > 100
end end
end end

13
test/unit/issue_nested_set_test.rb
View File

@ -356,6 +356,19 @@ class IssueNestedSetTest < ActiveSupport::TestCase
assert_equal 12, parent.reload.estimated_hours assert_equal 12, parent.reload.estimated_hours
end end
def test_done_ratio_of_parent_with_a_child_without_estimated_time_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!(:parent_issue_id => parent.id)
parent.reload.children.each do |child|
child.update_attribute :status_id, 5
puts parent.reload.done_ratio
end
assert_equal 100, parent.reload.done_ratio
end
def test_move_parent_updates_old_parent_attributes def test_move_parent_updates_old_parent_attributes
first_parent = Issue.generate! first_parent = Issue.generate!
second_parent = Issue.generate! second_parent = Issue.generate!