diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-02-08 15:35:12 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-02-08 15:35:12 +0000 |
| commit | 6aaaac237300d168a42f09a4ecf855ae1b1f9737 (patch) | |
| tree | 26ae8c29ae287029090d7cab544db169e4b09215 | |
| parent | 64addce6c60c2580a878670f15f733f59477d98d (diff) | |
| download | redmine-6aaaac237300d168a42f09a4ecf855ae1b1f9737.tar.gz redmine-6aaaac237300d168a42f09a4ecf855ae1b1f9737.zip | |
Fixed an error in IssuesControllerTest#test_index_with_query_grouped_by_tracker_in_reverse_order with SQLServer.
git-svn-id: http://svn.redmine.org/redmine/trunk@13991 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/models/query.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/query.rb b/app/models/query.rb index 6d043789a..847691e72 100644 --- a/app/models/query.rb +++ b/app/models/query.rb @@ -509,7 +509,7 @@ class Query < ActiveRecord::Base # Returns the SQL sort order that should be prepended for grouping def group_by_sort_order if grouped? && (column = group_by_column) - order = sort_criteria_order_for(column.name) || column.default_order + order = (sort_criteria_order_for(column.name) || column.default_order).upcase column.sortable.is_a?(Array) ? column.sortable.collect {|s| "#{s} #{order}"}.join(',') : "#{column.sortable} #{order}" |