Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-03-25 22:00:43 +01:00
Code Issues Packages Projects Releases Activity

Merged r16491 (#25526).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16494 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2017-04-05 16:12:04 +00:00
parent c260cd89bb
commit 9b2f70f4f1
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/issue.rb
View File

@@ -964,7 +964,7 @@ class Issue < ActiveRecord::Base
# Returns the number of hours spent on this issue
def spent_hours
@spent_hours ||= time_entries.sum(:hours) || 0
@spent_hours ||= time_entries.sum(:hours) || 0.0
end
# Returns the total number of hours spent on this issue and its descendants
@@ -1003,7 +1003,7 @@ class Issue < ActiveRecord::Base
if issues.any?
hours_by_issue_id = TimeEntry.visible(user).where(:issue_id => issues.map(&:id)).group(:issue_id).sum(:hours)
issues.each do |issue|
issue.instance_variable_set "@spent_hours", (hours_by_issue_id[issue.id] || 0)
issue.instance_variable_set "@spent_hours", (hours_by_issue_id[issue.id] || 0.0)
end
end
end
@@ -1016,7 +1016,7 @@ class Issue < ActiveRecord::Base
" AND parent.lft <= #{Issue.table_name}.lft AND parent.rgt >= #{Issue.table_name}.rgt").
where("parent.id IN (?)", issues.map(&:id)).group("parent.id").sum(:hours)
issues.each do |issue|
issue.instance_variable_set "@total_spent_hours", (hours_by_issue_id[issue.id] || 0)
issue.instance_variable_set "@total_spent_hours", (hours_by_issue_id[issue.id] || 0.0)
end
end
end