meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-01-11 18:11:32 +00:00
Code Issues Releases Wiki Activity

Test failure (#23996).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@15969 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2016-11-18 13:51:19 +00:00
parent 5e2f833f0c
commit da22fb0d41
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/my/blocks/_timelog.html.erb
View File

@ -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 -%>