summaryrefslogtreecommitdiffstats
path: root/app/controllers
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2012-06-16 20:09:12 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2012-06-16 20:09:12 +0000
commit2c07b478bb1e2954c44d9def732202a8edea9837 (patch)
treeee86c7ba28af094c6f0d13d992b445f9f3fc5d36 /app/controllers
parent542b355210f901e9628127b8ae9a4de1787710f7 (diff)
downloadredmine-2c07b478bb1e2954c44d9def732202a8edea9837.tar.gz
redmine-2c07b478bb1e2954c44d9def732202a8edea9837.zip
Fixed that time entries should be sorted by date and created_on (#11178).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9837 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/timelog_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/timelog_controller.rb b/app/controllers/timelog_controller.rb
index dab2e0731..30d6cc28a 100644
--- a/app/controllers/timelog_controller.rb
+++ b/app/controllers/timelog_controller.rb
@@ -39,7 +39,7 @@ class TimelogController < ApplicationController
def index
sort_init 'spent_on', 'desc'
- sort_update 'spent_on' => 'spent_on',
+ sort_update 'spent_on' => ['spent_on', "#{TimeEntry.table_name}.created_on"],
'user' => 'user_id',
'activity' => 'activity_id',
'project' => "#{Project.table_name}.name",