diff options
| author | Marius Balteanu <marius.balteanu@zitec.com> | 2025-03-07 07:41:07 +0000 |
|---|---|---|
| committer | Marius Balteanu <marius.balteanu@zitec.com> | 2025-03-07 07:41:07 +0000 |
| commit | d8e945ca8e5f3d65f9899c56503572e328f32179 (patch) | |
| tree | 71acb1d30d75c6d2de7c207a84ca00138bc927f5 | |
| parent | c233b419093cdee16ee20de7db44d19645cc6095 (diff) | |
| download | redmine-d8e945ca8e5f3d65f9899c56503572e328f32179.tar.gz redmine-d8e945ca8e5f3d65f9899c56503572e328f32179.zip | |
Merged r23521 and r23522 from trunk to 6.0-stable (#42238).
git-svn-id: https://svn.redmine.org/redmine/branches/6.0-stable@23523 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/helpers/queries_helper.rb | 2 | ||||
| -rw-r--r-- | test/fixtures/queries.yml | 2 | ||||
| -rw-r--r-- | test/functional/issues_controller_test.rb | 2 | ||||
| -rw-r--r-- | test/functional/queries_controller_test.rb | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/app/helpers/queries_helper.rb b/app/helpers/queries_helper.rb index 708a8acfb..5e6d91a41 100644 --- a/app/helpers/queries_helper.rb +++ b/app/helpers/queries_helper.rb @@ -510,7 +510,7 @@ module QueriesHelper url_params.merge(:query_id => query), :class => css, :title => query.description, - :data => { :disable_with => query.name }) + + :data => { :disable_with => CGI.escapeHTML(query.name) }) + clear_link.html_safe) end.join("\n").html_safe, :class => 'queries' diff --git a/test/fixtures/queries.yml b/test/fixtures/queries.yml index cc0ea220f..c7a4e276d 100644 --- a/test/fixtures/queries.yml +++ b/test/fixtures/queries.yml @@ -81,7 +81,7 @@ queries_005: project_id: visibility: 2 name: Open issues by priority and tracker - description: Description for Oepn issues by priority and tracker + description: Description for Open issues by priority and tracker filters: | --- status_id: diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb index 2ed9ac9ea..eb2d5a6ce 100644 --- a/test/functional/issues_controller_test.rb +++ b/test/functional/issues_controller_test.rb @@ -332,7 +332,7 @@ class IssuesControllerTest < Redmine::ControllerTest # assert link properties assert_select( 'a.query.selected[title=?][href=?]', - 'Description for Oepn issues by priority and tracker', + 'Description for Open issues by priority and tracker', '/projects/ecookbook/issues?query_id=5', :text => "Open issues by priority and tracker" ) diff --git a/test/functional/queries_controller_test.rb b/test/functional/queries_controller_test.rb index 28423366e..03d3d6b75 100644 --- a/test/functional/queries_controller_test.rb +++ b/test/functional/queries_controller_test.rb @@ -676,7 +676,7 @@ class QueriesControllerTest < Redmine::ControllerTest get(:edit, :params => {:id => 5}) assert_response :success - assert_select 'input[name="query[description]"][value=?]', 'Description for Oepn issues by priority and tracker' + assert_select 'input[name="query[description]"][value=?]', 'Description for Open issues by priority and tracker' end def test_edit_invalid_query |