summaryrefslogtreecommitdiffstats
path: root/app/views/timelog
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2008-12-24 11:23:17 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2008-12-24 11:23:17 +0000
commit733987fbb6e4652c40d27fdca111f97754cc5920 (patch)
tree8f641f2c8d69fc7c3f5490c3b63cee6d79809b1b /app/views/timelog
parent7389b4bed0cabf3e248707474a63c459be91ab9d (diff)
downloadredmine-733987fbb6e4652c40d27fdca111f97754cc5920.tar.gz
redmine-733987fbb6e4652c40d27fdca111f97754cc5920.zip
Merged r2168 to r2171 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/0.8-stable@2172 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/timelog')
-rw-r--r--app/views/timelog/_list.rhtml8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/views/timelog/_list.rhtml b/app/views/timelog/_list.rhtml
index 8aebd75de..1144d42cc 100644
--- a/app/views/timelog/_list.rhtml
+++ b/app/views/timelog/_list.rhtml
@@ -2,10 +2,10 @@
<thead>
<tr>
<%= 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') %>
+<%= sort_header_tag('user', :caption => l(:label_member)) %>
+<%= sort_header_tag('activity', :caption => l(:label_activity)) %>
+<%= sort_header_tag('project', :caption => l(:label_project)) %>
+<%= sort_header_tag('issue', :caption => l(:label_issue), :default_order => 'desc') %>
<th><%= l(:field_comments) %></th>
<%= sort_header_tag('hours', :caption => l(:field_hours)) %>
<th></th>