GitLab wurde erfolgreich aktualisiert. Durch regelmäßige Updates bleibt das THM GitLab sicher. Danke für Ihre Geduld.

Commit 86b99698 authored by jplang's avatar jplang

Malformed SQL query with SQLServer when grouping and sorting by fixed version (#22808).

git-svn-id: https://svn.redmine.org/redmine/trunk@15416 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent b7c2a3a5
......@@ -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
......
......@@ -273,6 +273,22 @@ class IssuesControllerTest < ActionController::TestCase
assert_not_nil assigns(:issue_count_by_group)
end
def test_index_with_query_grouped_and_sorted_by_fixed_version
get :index, :project_id => 1, :set_filter => 1, :group_by => "fixed_version", :sort => "fixed_version"
assert_response :success
assert_template 'index'
assert_not_nil assigns(:issues)
assert_not_nil assigns(:issue_count_by_group)
end
def test_index_with_query_grouped_and_sorted_by_fixed_version_in_reverse_order
get :index, :project_id => 1, :set_filter => 1, :group_by => "fixed_version", :sort => "fixed_version:desc"
assert_response :success
assert_template 'index'
assert_not_nil assigns(:issues)
assert_not_nil assigns(:issue_count_by_group)
end
def test_index_with_query_grouped_by_list_custom_field
get :index, :project_id => 1, :query_id => 9
assert_response :success
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment