| @@ -509,7 +509,7 class Query < ActiveRecord::Base | |||||
| 509 | # Returns the SQL sort order that should be prepended for grouping |
|
509 | # Returns the SQL sort order that should be prepended for grouping | |
| 510 | def group_by_sort_order |
|
510 | def group_by_sort_order | |
| 511 | if grouped? && (column = group_by_column) |
|
511 | if grouped? && (column = group_by_column) | |
| 512 | order = (sort_criteria_order_for(column.name) || column.default_order).upcase |
|
512 | order = (sort_criteria_order_for(column.name) || column.default_order).try(:upcase) | |
| 513 | column.sortable.is_a?(Array) ? |
|
513 | column.sortable.is_a?(Array) ? | |
| 514 | column.sortable.collect {|s| "#{s} #{order}"}.join(',') : |
|
514 | column.sortable.collect {|s| "#{s} #{order}"}.join(',') : | |
| 515 | "#{column.sortable} #{order}" |
|
515 | "#{column.sortable} #{order}" | |
General Comments 0
You need to be logged in to leave comments.
Login now