diff options
| -rw-r--r-- | app/controllers/timelog_controller.rb | 8 | ||||
| -rw-r--r-- | app/views/timelog/details.rhtml | 6 |
2 files changed, 9 insertions, 5 deletions
diff --git a/app/controllers/timelog_controller.rb b/app/controllers/timelog_controller.rb index 39e6d2fd3..926fe0c6f 100644 --- a/app/controllers/timelog_controller.rb +++ b/app/controllers/timelog_controller.rb @@ -151,6 +151,8 @@ private l(:field_user), l(:field_activity), l(:field_issue), + l(:field_tracker), + l(:field_subject), l(:field_hours), l(:field_comments) ] @@ -158,9 +160,11 @@ private # csv lines @entries.each do |entry| fields = [l_date(entry.spent_on), - entry.user.name, - entry.activity.name, + entry.user, + entry.activity, (entry.issue ? entry.issue.id : nil), + (entry.issue ? entry.issue.tracker : nil), + (entry.issue ? entry.issue.subject : nil), entry.hours, entry.comments ] diff --git a/app/views/timelog/details.rhtml b/app/views/timelog/details.rhtml index ac647c3a5..6f119206e 100644 --- a/app/views/timelog/details.rhtml +++ b/app/views/timelog/details.rhtml @@ -12,7 +12,7 @@ <% unless @entries.empty? %>
<table class="list">
<thead>
-<%= sort_header_tag('spent_on', :caption => l(:label_date)) %>
+<%= sort_header_tag('spent_on', :caption => l(:label_date), :default_order => 'desc') %>
<%= sort_header_tag('user_id', :caption => l(:label_member)) %>
<%= sort_header_tag('activity_id', :caption => l(:label_activity)) %>
<%= sort_header_tag('issue_id', :caption => l(:label_issue)) %>
@@ -26,10 +26,10 @@ <td align="center"><%= format_date(entry.spent_on) %></td>
<td align="center"><%= entry.user.name %></td>
<td align="center"><%= entry.activity.name %></td>
-<td align="center">
+<td>
<% if entry.issue %>
<div class="tooltip">
- <%= link_to_issue entry.issue %>
+ <%= link_to_issue entry.issue %>: <%= h(truncate(entry.issue.subject, 50)) %>
<span class="tip">
<%= render_issue_tooltip entry.issue %>
</span>
|