summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2015-07-05 11:47:28 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2015-07-05 11:47:28 +0000
commit71942ec5a2b5bccc44c95d22a467e8c5a6be3d98 (patch)
treef777d75d9b4cfc47870e926775d85aa846131023 /app
parentec1937479ffa9a41312281fdce80e565d33120d5 (diff)
downloadredmine-71942ec5a2b5bccc44c95d22a467e8c5a6be3d98.tar.gz
redmine-71942ec5a2b5bccc44c95d22a467e8c5a6be3d98.zip
Don't display estimated hours when nil and total is 0.
git-svn-id: http://svn.redmine.org/redmine/trunk@14405 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
-rw-r--r--app/views/issues/show.html.erb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index b91b512a3..f980f0b40 100644
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -58,7 +58,7 @@
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.total_estimated_hours.nil?
+ if @issue.estimated_hours.present? || @issue.total_estimated_hours.to_f > 0
rows.right l(:field_estimated_hours), issue_estimated_hours_details(@issue), :class => 'estimated-hours'
end
end