composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-24 11:08:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Advanced Search: Undefined for enums and unit tests

Browse Source 
SVN:b1162[5516]
This commit is contained in:
Eric Espié
2018-03-23 16:05:37 +00:00
parent 52731d7b0a
commit b566bead31
5 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sources/application/search/criterionconversion/criteriontosearchform.class.inc.php
View File

@@ -334,11 +334,6 @@ class CriterionToSearchForm extends CriterionConversionAbstract
return $aCriteria;
}
protected static function EnumToSearchForm($aCriteria, $aFields)
{
return self::ExternalKeyToSearchForm($aCriteria, $aFields);
}
protected static function DateToSearchForm($aCriteria, $aFields)
{
return self::DateTimeToSearchForm($aCriteria, $aFields);
@@ -417,6 +412,10 @@ class CriterionToSearchForm extends CriterionConversionAbstract
return $aCriteria;
}
protected static function EnumToSearchForm($aCriteria, $aFields)
{
return self::ExternalKeyToSearchForm($aCriteria, $aFields);
}
protected static function ExternalKeyToSearchForm($aCriteria, $aFields)
{
@@ -442,6 +441,14 @@ class CriterionToSearchForm extends CriterionConversionAbstract
break;
case 'IN':
break;
case 'OR':
// Special case when undefined and other values are selected
$aCriteria['operator'] = CriterionConversionAbstract::OP_IN;
if (isset($aCriteria['has_undefined']) && $aCriteria['has_undefined'])
{
$aCriteria['values'][] = array('value' => 'null', 'label' => 'null');
}
break;
default:
// Unknown operator
$aCriteria['widget'] = AttributeDefinition::SEARCH_WIDGET_TYPE_RAW;