From: Jean-Philippe Lang Date: Tue, 12 Feb 2008 21:43:54 +0000 (+0000) Subject: Added issue subject to the time entries view and subject + tracker to the csv export... X-Git-Tag: 0.7.0-RC1~145 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4dc7f662e3d93f93d8164c1450a9c4a49bc15503;p=redmine.git Added issue subject to the time entries view and subject + tracker to the csv export (#616). Default order on date column set to desc. 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 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? %> -<%= 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 @@ -
<%= format_date(entry.spent_on) %> <%= entry.user.name %> <%= entry.activity.name %> + <% if entry.issue %>
- <%= link_to_issue entry.issue %> + <%= link_to_issue entry.issue %>: <%= h(truncate(entry.issue.subject, 50)) %> <%= render_issue_tooltip entry.issue %>