Patch #616 » add_issue_summary_to_time_report.patch
app/controllers/timelog_controller.rb (working copy) | ||
---|---|---|
151 | 151 |
l(:field_user), |
152 | 152 |
l(:field_activity), |
153 | 153 |
l(:field_issue), |
154 |
l(:field_subject), |
|
154 | 155 |
l(:field_hours), |
155 | 156 |
l(:field_comments) |
156 | 157 |
] |
... | ... | |
161 | 162 |
entry.user.name, |
162 | 163 |
entry.activity.name, |
163 | 164 |
(entry.issue ? entry.issue.id : nil), |
165 |
(entry.issue ? entry.issue.subject : nil ), |
|
164 | 166 |
entry.hours, |
165 | 167 |
entry.comments |
166 | 168 |
] |
app/views/timelog/details.rhtml (working copy) | ||
---|---|---|
16 | 16 |
<%= sort_header_tag('user_id', :caption => l(:label_member)) %> |
17 | 17 |
<%= sort_header_tag('activity_id', :caption => l(:label_activity)) %> |
18 | 18 |
<%= sort_header_tag('issue_id', :caption => l(:label_issue)) %> |
19 |
<th>Issue Name</th> |
|
19 | 20 |
<th><%= l(:field_comments) %></th> |
20 | 21 |
<%= sort_header_tag('hours', :caption => l(:field_hours)) %> |
21 | 22 |
<th></th> |
... | ... | |
36 | 37 |
</div> |
37 | 38 |
<% end %> |
38 | 39 |
</td> |
40 |
<td><%=h truncate entry.issue.subject, 50 %></td> |
|
39 | 41 |
<td><%=h entry.comments %></td> |
40 | 42 |
<td align="center"><strong><%= entry.hours %></strong></td> |
41 | 43 |
<td align="center"><%= link_to_if_authorized(l(:button_edit), {:controller => 'timelog', :action => 'edit', :id => entry}, :class => "icon icon-edit") if entry.user_id == @owner_id %></td> |
... | ... | |
48 | 50 |
<%= l(:label_export_to) %> |
49 | 51 |
<%= link_to 'CSV', params.update(:export => 'csv'), :class => 'icon icon-csv' %> |
50 | 52 |
</div> |
51 |
<% end %> |
|
53 |
<% end %> |
config/environments/production.rb (working copy) | ||
---|---|---|
20 | 20 | |
21 | 21 |
# No email in production log |
22 | 22 |
config.action_mailer.logger = nil |
23 |
config.action_mailer.smtp_settings = {:address => "10.10.2.10", :domain => "resodirect.com" } |
|
24 |
config.action_mailer.perform_deliveries = true |
- « Previous
- 1
- 2
- Next »