From 6e20121bb13c458bc007b309f2a49aff7f55a384 Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Wed, 16 Sep 2015 03:52:20 +0000 Subject: [PATCH] Merged r14405 from trunk to 3.1-stable (#11253, #20456) Don't display estimated hours when nil and total is 0. git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14596 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/views/issues/show.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- 2.39.5