]> source.dussan.org Git - redmine.git/commitdiff
Fixed an error in IssuesControllerTest#test_index_with_query_grouped_by_tracker_in_re...
authorJean-Philippe Lang <jp_lang@yahoo.fr>
Sun, 8 Feb 2015 15:35:12 +0000 (15:35 +0000)
committerJean-Philippe Lang <jp_lang@yahoo.fr>
Sun, 8 Feb 2015 15:35:12 +0000 (15:35 +0000)
git-svn-id: http://svn.redmine.org/redmine/trunk@13991 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/models/query.rb

index 6d043789af229f400d08f9a64d085f075515b695..847691e724fa64d0196d5199817c847478c3d6a6 100644 (file)
@@ -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}"