diff options
| -rw-r--r-- | app/models/concerns/milestoneish.rb | 2 | ||||
| -rw-r--r-- | app/views/shared/milestones/_sidebar.html.haml | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/models/concerns/milestoneish.rb b/app/models/concerns/milestoneish.rb index 7fe55f8402f..7026f565706 100644 --- a/app/models/concerns/milestoneish.rb +++ b/app/models/concerns/milestoneish.rb @@ -87,7 +87,7 @@ module Milestoneish end def total_issue_time_spent - issues.joins(:timelogs).sum(:time_spent) + @total_issue_time_spent ||= issues.joins(:timelogs).sum(:time_spent) end def human_total_issue_time_spent diff --git a/app/views/shared/milestones/_sidebar.html.haml b/app/views/shared/milestones/_sidebar.html.haml index d396e80e12c..4f51455c26e 100644 --- a/app/views/shared/milestones/_sidebar.html.haml +++ b/app/views/shared/milestones/_sidebar.html.haml @@ -92,14 +92,14 @@ - if milestone.human_total_issue_time_spent = milestone.human_total_issue_time_spent - else - None + = _("None") .title.hide-collapsed - Total issue time spent + = _("Total issue time spent") .value.hide-collapsed - if milestone.human_total_issue_time_spent %span.bold= milestone.human_total_issue_time_spent - else - %span.no-value No time spent + %span.no-value= _("No time spent") .block.merge-requests .sidebar-collapsed-icon |