diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-12-24 11:23:17 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-12-24 11:23:17 +0000 |
| commit | 733987fbb6e4652c40d27fdca111f97754cc5920 (patch) | |
| tree | 8f641f2c8d69fc7c3f5490c3b63cee6d79809b1b /app/controllers/timelog_controller.rb | |
| parent | 7389b4bed0cabf3e248707474a63c459be91ab9d (diff) | |
| download | redmine-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/controllers/timelog_controller.rb')
| -rw-r--r-- | app/controllers/timelog_controller.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/app/controllers/timelog_controller.rb b/app/controllers/timelog_controller.rb index c333c02bb..58df1f5bc 100644 --- a/app/controllers/timelog_controller.rb +++ b/app/controllers/timelog_controller.rb @@ -138,7 +138,12 @@ class TimelogController < ApplicationController def details sort_init 'spent_on', 'desc' - sort_update + sort_update 'spent_on' => 'spent_on', + 'user' => 'user_id', + 'activity' => 'activity_id', + 'project' => "#{Project.table_name}.name", + 'issue' => 'issue_id', + 'hours' => 'hours' cond = ARCondition.new if @project.nil? |