##// END OF EJS Templates
Always return an array....
Jean-Philippe Lang -
r15035:ada650ce7f4b
parent child
Show More
@@ -543,11 +543,9 class Query < ActiveRecord::Base
543
543
544 # Returns the SQL sort order that should be prepended for grouping
544 # Returns the SQL sort order that should be prepended for grouping
545 def group_by_sort_order
545 def group_by_sort_order
546 if grouped? && (column = group_by_column)
546 if column = group_by_column
547 order = (sort_criteria_order_for(column.name) || column.default_order).try(:upcase)
547 order = (sort_criteria_order_for(column.name) || column.default_order).try(:upcase)
548 column.sortable.is_a?(Array) ?
548 Array(column.sortable).map {|s| "#{s} #{order}"}
549 column.sortable.collect {|s| "#{s} #{order}"} :
550 "#{column.sortable} #{order}"
551 end
549 end
552 end
550 end
553
551
General Comments 0
You need to be logged in to leave comments. Login now