summaryrefslogtreecommitdiffstats
path: root/app/views/issues
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2012-09-11 14:13:30 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2012-09-11 14:13:30 +0000
commit7d8db59dae413f09a10d2e38adf8e49953493bf1 (patch)
tree9ae5da33f86972dc90380dc715c896deebd9351b /app/views/issues
parentd1606fd3e35d3ee471c0a72ce969d8dcdd4b84af (diff)
downloadredmine-7d8db59dae413f09a10d2e38adf8e49953493bf1.tar.gz
redmine-7d8db59dae413f09a10d2e38adf8e49953493bf1.zip
do not show estimated time if it is nil on issue page
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10364 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/issues')
-rw-r--r--app/views/issues/show.html.erb4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index df3b81f30..1313c833c 100644
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -56,7 +56,9 @@
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')
- rows.right l(:field_estimated_hours), l_hours(@issue.estimated_hours), :class => 'estimated-hours'
+ unless @issue.estimated_hours.nil?
+ rows.right l(:field_estimated_hours), l_hours(@issue.estimated_hours), :class => 'estimated-hours'
+ end
end
if User.current.allowed_to?(:view_time_entries, @project)
rows.right l(:label_spent_time), (@issue.total_spent_hours > 0 ? (link_to l_hours(@issue.total_spent_hours), {:controller => 'timelog', :action => 'index', :project_id => @project, :issue_id => @issue}) : "-"), :class => 'spent-time'