meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-01-04 22:59:47 +00:00
Code Issues Releases Wiki Activity

Error with MS SQL when displaying an issue from a list grouped and sorted by fixed version (#23839).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@15852 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2016-10-01 08:53:31 +00:00
parent 190f4c15c2
commit 1810283a66
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/query.rb
View File

@ -640,7 +640,7 @@ class Query < ActiveRecord::Base
# Returns the SQL sort order that should be prepended for grouping
def group_by_sort_order
if column = group_by_column
order = (sort_criteria_order_for(column.name) || column.default_order).try(:upcase)
order = (sort_criteria_order_for(column.name) || column.default_order || 'asc').try(:upcase)
Array(column.sortable).map {|s| "#{s} #{order}"}
end
end

12
test/integration/issues_test.rb
View File

@ -109,6 +109,18 @@ class IssuesTest < Redmine::IntegrationTest
assert_equal 0, Issue.find(1).attachments.length
end
def test_next_and_previous_links_should_be_displayed_after_query_grouped_and_sorted_by_version
with_settings :default_language => 'en' do
get '/projects/ecookbook/issues?set_filter=1&group_by=fixed_version&sort=priority:desc,fixed_version'
assert_response :success
assert_select 'td.id', :text => '5'
get '/issues/5'
assert_response :success
assert_select '.next-prev-links .position', :text => '5 of 6'
end
end
def test_next_and_previous_links_should_be_displayed_after_filter
with_settings :default_language => 'en' do
get '/projects/ecookbook/issues?set_filter=1&tracker_id=1'