From 8c9f9ba38b2939f099d7b0aa743afe78ec928dfa 2016-11-18 13:47:16 From: Jean-Philippe Lang Date: 2016-11-18 13:47:16 Subject: [PATCH] Test broken, display hours like in other tables (#23996). git-svn-id: http://svn.redmine.org/redmine/trunk@15967 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/app/views/timelog/_report_criteria.html.erb b/app/views/timelog/_report_criteria.html.erb index a74cdbf..f418117 100644 --- a/app/views/timelog/_report_criteria.html.erb +++ b/app/views/timelog/_report_criteria.html.erb @@ -8,9 +8,9 @@ <% total = 0 -%> <% @report.periods.each do |period| -%> <% sum = sum_hours(select_hours(hours_for_value, @report.columns, period.to_s)); total += sum -%> - <%= html_hours(l_hours_short(sum)) if sum > 0 %> + <%= html_hours(format_hours(sum)) if sum > 0 %> <% end -%> - <%= html_hours(l_hours_short(total)) if total > 0 %> + <%= html_hours(format_hours(total)) if total > 0 %> <% if criterias.length > level+1 -%> <%= render(:partial => 'report_criteria', :locals => {:criterias => criterias, :hours => hours_for_value, :level => (level + 1)}) %> diff --git a/app/views/timelog/report.html.erb b/app/views/timelog/report.html.erb index ecab7de..c377de6 100644 --- a/app/views/timelog/report.html.erb +++ b/app/views/timelog/report.html.erb @@ -52,9 +52,9 @@ <% total = 0 -%> <% @report.periods.each do |period| -%> <% sum = sum_hours(select_hours(@report.hours, @report.columns, period.to_s)); total += sum -%> - <%= html_hours(l_hours_short(sum)) if sum > 0 %> + <%= html_hours(format_hours(sum)) if sum > 0 %> <% end -%> - <%= html_hours(l_hours_short(total)) if total > 0 %> + <%= html_hours(format_hours(total)) if total > 0 %>