From eac5cf8b9303e8f644b350c0e0c36bc1b209dc2f Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Sun, 26 Oct 2025 01:11:15 +0000 Subject: [PATCH] Merged r24065 from trunk to 6.0-stable (#43378). git-svn-id: https://svn.redmine.org/redmine/branches/6.0-stable@24067 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/helpers/queries_helper.rb | 2 +- test/functional/issues_controller_test.rb | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/helpers/queries_helper.rb b/app/helpers/queries_helper.rb index ca7168f27..3afba3f53 100644 --- a/app/helpers/queries_helper.rb +++ b/app/helpers/queries_helper.rb @@ -227,7 +227,7 @@ module QueriesHelper end content = link_to( - sprite_icon(icon, column.caption), + icon ? sprite_icon(icon, column.caption) : column.caption, {:params => request.query_parameters.deep_merge(sort_param)}, link_options ) diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb index 62361b1ec..25b73a63f 100644 --- a/test/functional/issues_controller_test.rb +++ b/test/functional/issues_controller_test.rb @@ -1242,6 +1242,12 @@ class IssuesControllerTest < Redmine::ControllerTest issues_in_list ) 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 def test_index_sort_by_field_not_included_in_columns