diff options
Diffstat (limited to 'app/models')
| -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 281346ece..0e6064fc6 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).upcase + order = (sort_criteria_order_for(column.name) || column.default_order).try(:upcase) column.sortable.is_a?(Array) ? column.sortable.collect {|s| "#{s} #{order}"}.join(',') : "#{column.sortable} #{order}" |