meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-19 15:01:14 +00:00
Code Issues Releases Wiki Activity

Always return an array.

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@15417 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2016-05-16 07:08:31 +00:00
parent 14beafcc24
commit ada650ce7f
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/query.rb
View File

@ -543,11 +543,9 @@ class Query < ActiveRecord::Base
# Returns the SQL sort order that should be prepended for grouping # Returns the SQL sort order that should be prepended for grouping
def group_by_sort_order def group_by_sort_order
if grouped? && (column = group_by_column) if column = group_by_column
order = (sort_criteria_order_for(column.name) || column.default_order).try(:upcase) order = (sort_criteria_order_for(column.name) || column.default_order).try(:upcase)
column.sortable.is_a?(Array) ? Array(column.sortable).map {|s| "#{s} #{order}"}
column.sortable.collect {|s| "#{s} #{order}"} :
"#{column.sortable} #{order}"
end end
end end