Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-03-18 02:20:59 +01:00
Code Issues Packages Projects Releases Activity

Merge r24343 from trunk to 6.1-stable (#43694).

Browse Source 
git-svn-id: https://svn.redmine.org/redmine/branches/6.1-stable@24354 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Marius Balteanu
2026-01-23 03:43:34 +00:00
parent d97bebd0e0
commit 6c06b7fdfa
2 changed files with 34 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/application-legacy.js
View File

@@ -207,7 +207,7 @@ function buildFilterRow(field, operator, values) {
var select;
var tr = $('<div class="filter">').attr('id', 'tr_'+fieldId).html(
'<div class="field"><input checked="checked" id="cb_'+fieldId+'" name="f[]" value="'+field+'" type="checkbox"><label for="cb_'+fieldId+'"> '+filterOptions['name']+'</label></div>' +
'<div class="field"><input checked="checked" id="cb_'+fieldId+'" name="f[]" value="'+field+'" type="checkbox"><label for="cb_'+fieldId+'"> '+sanitizeHTML(filterOptions['name'])+'</label></div>' +
'<div class="operator"><select id="operators_'+fieldId+'" name="op['+field+']"></select></div>' +
'<div class="values"></div>'
);

33
test/system/query_test.rb Normal file
View File

@@ -0,0 +1,33 @@
# frozen_string_literal: true
# Redmine - project management software
# Copyright (C) 2006- Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
require_relative '../application_system_test_case'
class QuerySystemTest < ApplicationSystemTestCase
def test_query_filter_row_should_escape_html_elements
cf = IssueCustomField.create!(name: 'My <select>', field_format: 'string', is_filter: true)
log_user('jsmith', 'jsmith')
visit '/issues'
# click_on 'Add filter'
select 'My <select>', from: 'Add filter'
assert_selector "div#tr_cf_#{cf.id} label", text: 'My <select>'
end
end