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

Revert r23046 (#32523).

Browse Source 
The change broke filters.


git-svn-id: https://svn.redmine.org/redmine/trunk@23054 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA 2024-09-12 01:55:53 +00:00
parent d20c8ef26e
commit 1d214102c3
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/assets/javascripts/application.js
View File

@ -185,7 +185,7 @@ function buildFilterRow(field, operator, values) {
if (!filterOptions) return;
var operators = operatorByType[filterOptions['type']];
var filterValues = filterOptions['values'];
var select;
var i, 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>' +
@ -195,11 +195,11 @@ function buildFilterRow(field, operator, values) {
filterTable.append(tr);
select = tr.find('.operator select');
operators.forEach(function(op) {
var option = $('<option>').val(op).text(operatorLabels[op]);
if (op == operator) { option.prop('selected', true); }
for (i = 0; i < operators.length; i++) {
var option = $('<option>').val(operators[i]).text(operatorLabels[operators[i]]);
if (operators[i] == operator) { option.prop('selected', true); }
select.append(option);
});
}
select.change(function(){ toggleOperator(field); });
switch (filterOptions['type']) {
@ -215,7 +215,7 @@ function buildFilterRow(field, operator, values) {
);
select = tr.find('.values select');
if (values.length > 1) { select.attr('multiple', true); }
filterValues.forEach(function(filterValue) {
for (i = 0; i < filterValues.length; i++) {
var filterValue = filterValues[i];
var option = $('<option>');
if ($.isArray(filterValue)) {
@ -231,7 +231,7 @@ function buildFilterRow(field, operator, values) {
if ($.inArray(filterValue, values) > -1) {option.prop('selected', true);}
}
select.append(option);
});
}
break;
case "date":
case "date_past":
@ -259,13 +259,13 @@ function buildFilterRow(field, operator, values) {
);
$('#values_'+fieldId).val(values[0]);
select = tr.find('.values select');
filterValues.forEach(function(filterValue) {
for (i = 0; i < filterValues.length; i++) {
var filterValue = filterValues[i];
var option = $('<option>');
option.val(filterValue[1]).text(filterValue[0]);
if (values[0] == filterValue[1]) { option.prop('selected', true); }
select.append(option);
});
}
break;
case "integer":
case "float":