Added issue subject to the time entries view and subject + tracker to the csv export...

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1142 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/controllers/timelog_controller.rb b/app/controllers/timelog_controller.rb
index 39e6d2fd392b0e4b85aed143b5888aa20092d7ef..926fe0c6f75a024db2b410031f6192b857fbaa5e 100644 (file)
--- 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 ac647c3a5ca14e4126a79306baa05f1fb70d15cd..6f119206e1e7f2f207d9705deaac39c4115384a5 100644 (file)
--- a/app/views/timelog/details.rhtml
+++ b/app/views/timelog/details.rhtml
@@ -12,7 +12,7 @@
 <% unless @entries.empty? %>\r
 <table class="list">\r
 <thead>\r
-<%= sort_header_tag('spent_on', :caption => l(:label_date)) %>\r
+<%= sort_header_tag('spent_on', :caption => l(:label_date), :default_order => 'desc') %>\r
 <%= sort_header_tag('user_id', :caption => l(:label_member)) %>\r
 <%= sort_header_tag('activity_id', :caption => l(:label_activity)) %>\r
 <%= sort_header_tag('issue_id', :caption => l(:label_issue)) %>\r
@@ -26,10 +26,10 @@
 <td align="center"><%= format_date(entry.spent_on) %></td>\r
 <td align="center"><%= entry.user.name %></td>\r
 <td align="center"><%= entry.activity.name %></td>\r
-<td align="center">\r
+<td>\r
     <% if entry.issue %>\r
     <div class="tooltip">\r
-    <%= link_to_issue entry.issue %>\r
+    <%= link_to_issue entry.issue %>: <%= h(truncate(entry.issue.subject, 50)) %>\r
     <span class="tip">\r
     <%= render_issue_tooltip entry.issue %>\r
     </span>            \r