summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2016-05-16 07:03:14 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2016-05-16 07:03:14 +0000
commit14beafcc24af288cabea00637c11e4df92b8d959 (patch)
treec777b05e0a4357be31e3f45e5a13fab4b4841a18 /app
parent7d6b3d344db870e1417fc5a08413729b60e7ce77 (diff)
downloadredmine-14beafcc24af288cabea00637c11e4df92b8d959.tar.gz
redmine-14beafcc24af288cabea00637c11e4df92b8d959.zip
Malformed SQL query with SQLServer when grouping and sorting by fixed version (#22808).
git-svn-id: http://svn.redmine.org/redmine/trunk@15416 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
-rw-r--r--app/models/query.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/query.rb b/app/models/query.rb
index d1315d5de..a9d24ad30 100644
--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -546,7 +546,7 @@ class Query < ActiveRecord::Base
if grouped? && (column = group_by_column)
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.collect {|s| "#{s} #{order}"} :
"#{column.sortable} #{order}"
end
end