diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-02-27 20:50:19 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-02-27 20:50:19 +0000 |
| commit | 200842ba5e753f342940d7df0f1cc342ae8485d4 (patch) | |
| tree | 50ceded1ab5f0472b3896a07a330b8304521a84d /app/views/timelog/_list.rhtml | |
| parent | 421d4203113a3cefdcc6998a9b9cc92ddbb27321 (diff) | |
| download | redmine-200842ba5e753f342940d7df0f1cc342ae8485d4.tar.gz redmine-200842ba5e753f342940d7df0f1cc342ae8485d4.zip | |
Propagates time tracking to the parent project (closes #433). Time report enhancements.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1176 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/timelog/_list.rhtml')
| -rw-r--r-- | app/views/timelog/_list.rhtml | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/app/views/timelog/_list.rhtml b/app/views/timelog/_list.rhtml index 929d8f7dd..ae5b6376a 100644 --- a/app/views/timelog/_list.rhtml +++ b/app/views/timelog/_list.rhtml @@ -3,6 +3,7 @@ <%= 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("#{Project.table_name}.name", :caption => l(:label_project)) %> <%= sort_header_tag('issue_id', :caption => l(:label_issue), :default_order => 'desc') %> <th><%= l(:field_comments) %></th> <%= sort_header_tag('hours', :caption => l(:field_hours)) %> @@ -12,17 +13,16 @@ <% entries.each do |entry| -%> <tr class="time-entry <%= cycle("odd", "even") %>"> <td class="spent_on"><%= format_date(entry.spent_on) %></td> -<td class="user"><%= entry.user.name %></td> -<td class="activity"><%= entry.activity.name %></td> +<td class="user"><%=h entry.user %></td> +<td class="activity"><%=h entry.activity %></td> +<td class="project"><%=h entry.project %></td> <td class="subject"> - <% if entry.issue -%> - <div class="tooltip"><%= link_to_issue entry.issue %>: <%= h(truncate(entry.issue.subject, 50)) -%> - <span class="tip"><%= render_issue_tooltip entry.issue %></span> - </div> - <% end -%> +<% if entry.issue -%> +<%= link_to_issue entry.issue %>: <%= h(truncate(entry.issue.subject, 50)) -%> +<% end -%> </td> <td class="comments"><%=h entry.comments %></td> -<td class="hours"><%= entry.hours %></td> +<td class="hours"><%= html_hours("%.2f" % entry.hours) %></td> <td align="center"><%= link_to_if_authorized(l(:button_edit), {:controller => 'timelog', :action => 'edit', :id => entry}, :class => 'icon icon-edit') if entry.editable_by?(User.current) %></td> |