composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-18 23:08:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°1556 Advanced Search : fix removing only criteria in first row (was generating "AND 1")

Browse Source
This commit is contained in:
Pierre Goiffon
2018-10-09 17:19:23 +02:00
parent 80be4b4371
commit 91b7130671
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
js/search/search_form_handler.js
View File

@@ -229,32 +229,38 @@ $(function()
}] }]
}; };
// - Retrieve criterion // - Retrieve criterion
this.elements.criterion_area.find('.sf_criterion_row').each(function(iIdx){ var iCurrentCriterionRow = 0;
var oCriterionRowElem = $(this); this.elements.criterion_area.find('.sf_criterion_row').each(function (iDomCriterionRowIdx) {
var isFirstRow = (iDomCriterionRowIdx === 0),
oCriterionRowElem = $(this),
oCriteriaRowCriterias = oCriterionRowElem.find('.search_form_criteria');
if (oCriterionRowElem.find('.search_form_criteria').length == 0 && iIdx > 0) if (oCriteriaRowCriterias.length === 0)
{ {
$(this).remove(); if (!isFirstRow)
{
$(this).remove();
}
} }
else else
{ {
oCriterionRowElem.find('.search_form_criteria').each(function () oCriteriaRowCriterias.each(function () {
{
var oCriteriaData = $(this).triggerHandler('itop.search.criteria.get_data'); var oCriteriaData = $(this).triggerHandler('itop.search.criteria.get_data');
if (null != oCriteriaData) if (null != oCriteriaData)
{ {
if (!oCriterion['or'][iIdx]) if (!oCriterion['or'][iCurrentCriterionRow])
{ {
oCriterion['or'][iIdx] = {'and': []}; oCriterion['or'][iCurrentCriterionRow] = {'and': []};
} }
oCriterion['or'][iIdx]['and'].push(oCriteriaData); oCriterion['or'][iCurrentCriterionRow]['and'].push(oCriteriaData);
} }
else else
{ {
$(this).remove(); $(this).remove();
} }
}); });
iCurrentCriterionRow++;
} }
}); });
// - Update search // - Update search