diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-02-08 16:24:19 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-02-08 16:24:19 +0000 |
| commit | 2b124f1e61da30a103f78a645e0237cb8c14d577 (patch) | |
| tree | e77b143cd894053a83a2183300709ab09d58db41 /app/models/query.rb | |
| parent | db9bf8cd7339532054fb6ce2d229c8edf9cc4f31 (diff) | |
| download | redmine-2b124f1e61da30a103f78a645e0237cb8c14d577.tar.gz redmine-2b124f1e61da30a103f78a645e0237cb8c14d577.zip | |
Don't call #upcase on nil.
git-svn-id: http://svn.redmine.org/redmine/trunk@13994 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models/query.rb')
| -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}" |