summaryrefslogtreecommitdiffstats
path: root/app/views
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/views
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/views')
-rw-r--r--app/views/issues/show.html.erb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index ad8ee98a4..d8219f933 100644
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -58,8 +58,8 @@
rows.right l(:field_done_ratio), progress_bar(@issue.done_ratio, :width => '80px', :legend => "#{@issue.done_ratio}%"), :class => 'progress'
end
unless @issue.disabled_core_fields.include?('estimated_hours')
- unless @issue.estimated_hours.nil?
- rows.right l(:field_estimated_hours), l_hours(@issue.estimated_hours), :class => 'estimated-hours'
+ unless @issue.total_estimated_hours.nil?
+ rows.right l(:field_estimated_hours), issue_estimated_hours_details(@issue), :class => 'estimated-hours'
end
end
if User.current.allowed_to?(:view_time_entries, @project)