diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2016-11-18 13:47:16 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2016-11-18 13:47:16 +0000 |
| commit | 8c9f9ba38b2939f099d7b0aa743afe78ec928dfa (patch) | |
| tree | a2a3a70a40e6fdbcb1316a9798bf21b89006b295 | |
| parent | 05a160e372f78071661e5d6ddc0a6eb49b77ee59 (diff) | |
| download | redmine-8c9f9ba38b2939f099d7b0aa743afe78ec928dfa.tar.gz redmine-8c9f9ba38b2939f099d7b0aa743afe78ec928dfa.zip | |
Test broken, display hours like in other tables (#23996).
git-svn-id: http://svn.redmine.org/redmine/trunk@15967 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/views/timelog/_report_criteria.html.erb | 4 | ||||
| -rw-r--r-- | app/views/timelog/report.html.erb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/views/timelog/_report_criteria.html.erb b/app/views/timelog/_report_criteria.html.erb index a74cdbfec..f4181172f 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 -%> - <td class="hours"><%= html_hours(l_hours_short(sum)) if sum > 0 %></td> + <td class="hours"><%= html_hours(format_hours(sum)) if sum > 0 %></td> <% end -%> - <td class="hours"><%= html_hours(l_hours_short(total)) if total > 0 %></td> + <td class="hours"><%= html_hours(format_hours(total)) if total > 0 %></td> </tr> <% 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 ecab7dea4..c377de63c 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 -%> - <td class="hours"><%= html_hours(l_hours_short(sum)) if sum > 0 %></td> + <td class="hours"><%= html_hours(format_hours(sum)) if sum > 0 %></td> <% end -%> - <td class="hours"><%= html_hours(l_hours_short(total)) if total > 0 %></td> + <td class="hours"><%= html_hours(format_hours(total)) if total > 0 %></td> </tr> </tbody> </table> |