##// END OF EJS Templates
jro_apps » redmine
RSS
Added issue subject to the time entries view and subject + tracker to the csv export (#616). Default order on date column set to desc....
Jean-Philippe Lang -
r1128:4dc7f662e3d9
parent child
Show More
Side by Side Unified
Context file:
r1128:4dc7f662e3d9 Loading diff...:
Show file before | Show file after | Hide comments
@@ -151,6 +151,8 private
151 l(:field_user),
151 l(:field_user),
152 l(:field_activity),
152 l(:field_activity),
153 l(:field_issue),
153 l(:field_issue),
154 l(:field_tracker),
155 l(:field_subject),
154 l(:field_hours),
156 l(:field_hours),
155 l(:field_comments)
157 l(:field_comments)
156 ]
158 ]
@@ -158,9 +160,11 private
158 # csv lines
160 # csv lines
159 @entries.each do |entry|
161 @entries.each do |entry|
160 fields = [l_date(entry.spent_on),
162 fields = [l_date(entry.spent_on),
161 entry.user.name,
163 entry.user,
162 entry.activity.name,
164 entry.activity,
163 (entry.issue ? entry.issue.id : nil),
165 (entry.issue ? entry.issue.id : nil),
166 (entry.issue ? entry.issue.tracker : nil),
167 (entry.issue ? entry.issue.subject : nil),
164 entry.hours,
168 entry.hours,
165 entry.comments
169 entry.comments
166 ]
170 ]
Show file before | Show file after | Hide comments
@@ -12,7 +12,7
12 <% unless @entries.empty? %>
12 <% unless @entries.empty? %>
13 <table class="list">
13 <table class="list">
14 <thead>
14 <thead>
15 <%= sort_header_tag('spent_on', :caption => l(:label_date)) %>
15 <%= sort_header_tag('spent_on', :caption => l(:label_date), :default_order => 'desc') %>
16 <%= sort_header_tag('user_id', :caption => l(:label_member)) %>
16 <%= sort_header_tag('user_id', :caption => l(:label_member)) %>
17 <%= sort_header_tag('activity_id', :caption => l(:label_activity)) %>
17 <%= sort_header_tag('activity_id', :caption => l(:label_activity)) %>
18 <%= sort_header_tag('issue_id', :caption => l(:label_issue)) %>
18 <%= sort_header_tag('issue_id', :caption => l(:label_issue)) %>
@@ -26,10 +26,10
26 <td align="center"><%= format_date(entry.spent_on) %></td>
26 <td align="center"><%= format_date(entry.spent_on) %></td>
27 <td align="center"><%= entry.user.name %></td>
27 <td align="center"><%= entry.user.name %></td>
28 <td align="center"><%= entry.activity.name %></td>
28 <td align="center"><%= entry.activity.name %></td>
29 <td align="center">
29 <td>
30 <% if entry.issue %>
30 <% if entry.issue %>
31 <div class="tooltip">
31 <div class="tooltip">
32 <%= link_to_issue entry.issue %>
32 <%= link_to_issue entry.issue %>: <%= h(truncate(entry.issue.subject, 50)) %>
33 <span class="tip">
33 <span class="tip">
34 <%= render_issue_tooltip entry.issue %>
34 <%= render_issue_tooltip entry.issue %>
35 </span>
35 </span>
General Comments 0
You need to be logged in to leave comments. Login now