From 2b124f1e61da30a103f78a645e0237cb8c14d577 2015-02-08 16:24:19
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: 2015-02-08 16:24:19
Subject: [PATCH] Don't call #upcase on nil.

git-svn-id: http://svn.redmine.org/redmine/trunk@13994 e93f8b46-1217-0410-a6f0-8f06a7374b81

---

diff --git a/app/models/query.rb b/app/models/query.rb
index 281346e..0e6064f 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}"