Advanced Search: code hardening and unit tests

SVN:b1162[5544]
This commit is contained in:
Eric Espié
2018-03-27 10:14:27 +00:00
parent 7672858d6b
commit bc9e1b1d94
4 changed files with 88 additions and 64 deletions

View File

@@ -318,13 +318,13 @@ class CriterionConversionTest extends ItopDataTestCase
if ($aCriteria['widget'] != \AttributeDefinition::SEARCH_WIDGET_TYPE_RAW)
{
unset($aCriteria['oql']);
if (isset($aFields['zlist'][$aCriteria['ref']]))
foreach($aFields as $aCatFields)
{
$aField = $aFields['zlist'][$aCriteria['ref']];
}
elseif (isset($aFields['others'][$aCriteria['ref']]))
{
$aField = $aFields['others'][$aCriteria['ref']];
if (isset($aCatFields[$aCriteria['ref']]))
{
$aField = $aCatFields[$aCriteria['ref']];
break;
}
}
if (isset($aField))
{