diff options
| author | Go MAEDA <maeda@farend.jp> | 2020-12-12 03:32:20 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2020-12-12 03:32:20 +0000 |
| commit | 5d017f42be3ecdcbc63f8189cadf832b70d6b661 (patch) | |
| tree | 9dbe1c238ae8e4c0c819cd7e72753cf3dad3e6c3 /app/models/time_entry_query.rb | |
| parent | f769d97de986e9953b5473dbfc34d7a213fa8293 (diff) | |
| download | redmine-5d017f42be3ecdcbc63f8189cadf832b70d6b661.tar.gz redmine-5d017f42be3ecdcbc63f8189cadf832b70d6b661.zip | |
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
Diffstat (limited to 'app/models/time_entry_query.rb')
| -rw-r--r-- | app/models/time_entry_query.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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), |