summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2016-11-18 13:51:19 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2016-11-18 13:51:19 +0000
commitda22fb0d41017aed0f089b21dad2af54a26fb85b (patch)
tree1d46dfc82639fce067ca0d10989917ad55f4cee4 /app
parent5e2f833f0c66c906a353687ee037416c43223c58 (diff)
downloadredmine-da22fb0d41017aed0f089b21dad2af54a26fb85b.tar.gz
redmine-da22fb0d41017aed0f089b21dad2af54a26fb85b.zip
Test failure (#23996).
git-svn-id: http://svn.redmine.org/redmine/trunk@15969 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
-rw-r--r--app/views/my/blocks/_timelog.html.erb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/my/blocks/_timelog.html.erb b/app/views/my/blocks/_timelog.html.erb
index 5b8820c19..dd962eae4 100644
--- a/app/views/my/blocks/_timelog.html.erb
+++ b/app/views/my/blocks/_timelog.html.erb
@@ -46,7 +46,7 @@ entries_by_day = entries.group_by(&:spent_on)
<tr class="odd">
<td><strong><%= day == User.current.today ? l(:label_today).titleize : format_date(day) %></strong></td>
<td colspan="2"></td>
- <td class="hours"><em><%= html_hours(l_hours_short(entries_by_day[day].sum(&:hours))) %></em></td>
+ <td class="hours"><em><%= html_hours(format_hours(entries_by_day[day].sum(&:hours))) %></em></td>
</tr>
<% entries_by_day[day].each do |entry| -%>
<tr class="time-entry hascontextmenu">
@@ -56,7 +56,7 @@ entries_by_day = entries.group_by(&:spent_on)
</td>
<td class="subject"><%= entry.project %> <%= h(' - ') + link_to_issue(entry.issue, :truncate => 50) if entry.issue %></td>
<td class="comments"><%= entry.comments %></td>
- <td class="hours"><%= html_hours(l_hours_short(entry.hours)) %></td>
+ <td class="hours"><%= html_hours(format_hours(entry.hours)) %></td>
</tr>
<% end -%>
<% end -%>