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 and Id first

Browse Source 
SVN:b1162[5514]
This commit is contained in:
Eric Espié
2018-03-23 15:02:23 +00:00
parent 7153ae9614
commit 465532014b
4 changed files with 15 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,7 +26,6 @@ namespace Combodo\iTop\Application\Search\CriterionConversion;
use AttributeDate;
use AttributeDateTime;
use AttributeDefinition;
use AttributeExternalKey;
use Combodo\iTop\Application\Search\AjaxSearchException;
use Combodo\iTop\Application\Search\CriterionConversionAbstract;
use Combodo\iTop\Application\Search\SearchForm;
@@ -150,7 +149,6 @@ class CriterionToOQL extends CriterionConversionAbstract
}
$bFilterOnUndefined = false;
$sFilterOnUndefined = '';
try
{
$aAttributeDefs = \MetaModel::ListAttributeDefs($sClass);
@@ -190,14 +188,6 @@ class CriterionToOQL extends CriterionConversionAbstract
$aValue = $aValues[$i];
if (isset($aValue['value']) && ($aValue['value'] === 'null'))
{
if ($oAttDef instanceof AttributeExternalKey)
{
$sFilterOnUndefined = "({$sRef} = 0)";
}
else
{
$sFilterOnUndefined = "ISNULL({$sRef})";
}
$bFilterOnUndefined = true;
unset($aValues[$i]);
break;
@@ -218,17 +208,18 @@ class CriterionToOQL extends CriterionConversionAbstract
if ($bFilterOnUndefined)
{
$sFilterOnUndefined = "ISNULL({$sRef})";
if (count($aValues) === 0)
{
return "{$sFilterOnUndefined}";
return $sFilterOnUndefined;
}
if (count($aInValues) == 1)
{
return "(({$sRef} = '$sInList') OR {$sFilterOnUndefined})";
return "((({$sRef} = '$sInList') OR {$sFilterOnUndefined}) AND 1)";
}
return "({$sRef} IN ('$sInList') OR {$sFilterOnUndefined})";
return "(({$sRef} IN ('$sInList') OR {$sFilterOnUndefined}) AND 1)";
}
if (count($aInValues) == 1)

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

@@ -424,14 +424,7 @@ class CriterionToSearchForm extends CriterionConversionAbstract
switch ($sOperator)
{
case '=':
if (!isset($aCriteria['values'][0]))
{
$aCriteria['operator'] = CriterionConversionAbstract::OP_EMPTY;
}
else
{
$aCriteria['operator'] = CriterionConversionAbstract::OP_IN;
}
$aCriteria['operator'] = CriterionConversionAbstract::OP_IN;
break;
case '!=':
if (!isset($aCriteria['values'][0]))