From 5d017f42be3ecdcbc63f8189cadf832b70d6b661 Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Sat, 12 Dec 2020 03:32:20 +0000 Subject: Spent time details are displayed in incorrect order when sorted by week and date (#33952). Patch by Yuichi HARADA. git-svn-id: http://svn.redmine.org/redmine/trunk@20634 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/time_entry_query.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/models/time_entry_query.rb') diff --git a/app/models/time_entry_query.rb b/app/models/time_entry_query.rb index 2607b57ef..500930145 100644 --- a/app/models/time_entry_query.rb +++ b/app/models/time_entry_query.rb @@ -25,7 +25,7 @@ class TimeEntryQuery < Query QueryColumn.new(:project, :sortable => "#{Project.table_name}.name", :groupable => true), QueryColumn.new(:spent_on, :sortable => ["#{TimeEntry.table_name}.spent_on", "#{TimeEntry.table_name}.created_on"], :default_order => 'desc', :groupable => true), TimestampQueryColumn.new(:created_on, :sortable => "#{TimeEntry.table_name}.created_on", :default_order => 'desc', :groupable => true), - QueryColumn.new(:tweek, :sortable => ["#{TimeEntry.table_name}.spent_on", "#{TimeEntry.table_name}.created_on"], :caption => :label_week), + QueryColumn.new(:tweek, :sortable => ["#{TimeEntry.table_name}.tyear", "#{TimeEntry.table_name}.tweek"], :caption => :label_week), QueryColumn.new(:author, :sortable => lambda {User.fields_for_order_statement}), QueryColumn.new(:user, :sortable => lambda {User.fields_for_order_statement}, :groupable => true), QueryColumn.new(:activity, :sortable => "#{TimeEntryActivity.table_name}.position", :groupable => true), -- cgit v1.2.3