Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-02 19:36:00 +01:00
Code Issues Packages Projects Releases Activity

Merged r24065 from trunk to 6.1-stable (#43378).

Browse Source 
git-svn-id: https://svn.redmine.org/redmine/branches/6.1-stable@24066 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA
2025-10-26 01:10:14 +00:00
parent 8327eb5a58
commit 064ae26e46
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/helpers/queries_helper.rb
View File

@@ -227,7 +227,7 @@ module QueriesHelper
end end
content = content =
link_to( link_to(
sprite_icon(icon, column.caption), icon ? sprite_icon(icon, column.caption) : column.caption,
{:params => request.query_parameters.deep_merge(sort_param)}, {:params => request.query_parameters.deep_merge(sort_param)},
link_options link_options
) )

6
test/functional/issues_controller_test.rb
View File

@@ -1242,6 +1242,12 @@ class IssuesControllerTest < Redmine::ControllerTest
issues_in_list issues_in_list
) )
assert_select 'table.issues.sort-by-tracker.sort-asc' assert_select 'table.issues.sort-by-tracker.sort-asc'
# Ensure that only the primary sort key column has a sort order icon
assert_select 'table.issues th.tracker svg', 1
css_select('table.issues th:not(.tracker)').each do |th|
assert_select th, 'svg', 0
end
end end
def test_index_sort_by_field_not_included_in_columns def test_index_sort_by_field_not_included_in_columns