summaryrefslogtreecommitdiffstats
path: root/app/helpers/issues_helper.rb
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2015-05-25 11:37:12 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2015-05-25 11:37:12 +0000
commit481f70d12537333206199b4a8d2891218959f4ad (patch)
tree901e580d30bbb87c2f43716574c29483f0dcac16 /app/helpers/issues_helper.rb
parent4f8bf001302f6e3e4fabe33b86891ec6581e867b (diff)
downloadredmine-481f70d12537333206199b4a8d2891218959f4ad.tar.gz
redmine-481f70d12537333206199b4a8d2891218959f4ad.zip
Don't store total estimated hours on parent issues (#16092).
Parent can now have its own estimate that is summed up with children estimates. git-svn-id: http://svn.redmine.org/redmine/trunk@14272 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/helpers/issues_helper.rb')
-rw-r--r--app/helpers/issues_helper.rb8
1 files changed, 8 insertions, 0 deletions
diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index 62a65a66e..a8dcdca91 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -113,6 +113,14 @@ module IssuesHelper
s.html_safe
end
+ def issue_estimated_hours_details(issue)
+ s = issue.estimated_hours.present? ? l_hours(issue.estimated_hours) : ""
+ unless issue.leaf? || issue.total_estimated_hours.nil?
+ s << " (#{l(:label_total)}: #{l_hours(issue.total_estimated_hours)})"
+ end
+ s.html_safe
+ end
+
# Returns an array of error messages for bulk edited issues
def bulk_edit_error_messages(issues)
messages = {}