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 a74cdbfeccd643cdd3fb7915bc20720d8de201db..f4181172fbb504915a09d513e476c0e7a65fba46 100644 (file)
--- 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 ecab7dea444faea4fce5e4fcccd433212acd8467..c377de63c4a35faac3a4e455f4c8005a025f6e72 100644 (file)
--- 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>