summaryrefslogtreecommitdiffstats
path: root/app/controllers/timelog_controller.rb
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2008-12-24 10:03:13 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2008-12-24 10:03:13 +0000
commit5c97a83a705f9dd7b7e8dd4470a2bc12fa5b22c1 (patch)
treedf9ac134224e4c43cdec2bd33d8801885c5d242b /app/controllers/timelog_controller.rb
parent7776b5b6659ee213c031fd1ed3f73d503af6541e (diff)
downloadredmine-5c97a83a705f9dd7b7e8dd4470a2bc12fa5b22c1.tar.gz
redmine-5c97a83a705f9dd7b7e8dd4470a2bc12fa5b22c1.zip
Validates sort_key and sort_order params (#2378).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2171 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers/timelog_controller.rb')
-rw-r--r--app/controllers/timelog_controller.rb7
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?