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

fix search error when search string '0'

Browse Source
This commit is contained in:
annProg
2020-09-28 22:16:49 +08:00
committed by Molkobain
parent da632c3f0f
commit 03190b95cf
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -114,12 +114,21 @@ class CriterionToOQL extends CriterionConversionAbstract
return addslashes($aValues[$iIndex]['value']);
}
private static function IsEmpty($sValue)
{
if ($sValue === "0")
{
return false;
}
return empty($sValue);
}
protected static function ContainsToOql($oSearch, $sRef, $aCriteria)
{
$aValues = self::GetValues($aCriteria);
$sValue = self::GetValue($aValues, 0);
if (empty($sValue))
if (self::IsEmpty($sValue))
{
return "1";
}
@@ -132,7 +141,7 @@ class CriterionToOQL extends CriterionConversionAbstract
$aValues = self::GetValues($aCriteria);
$sValue = self::GetValue($aValues, 0);
if (empty($sValue))
if (self::IsEmpty($sValue))
{
return "1";
}
@@ -145,7 +154,7 @@ class CriterionToOQL extends CriterionConversionAbstract
$aValues = self::GetValues($aCriteria);
$sValue = self::GetValue($aValues, 0);
if (empty($sValue))
if (self::IsEmpty($sValue))
{
return "1";
}
@@ -162,7 +171,7 @@ class CriterionToOQL extends CriterionConversionAbstract
return "({$sRef} = '0')";
}
if (empty($sValue) && (!(isset($aCriteria['has_undefined'])) || !($aCriteria['has_undefined'])))
if (self::IsEmpty($sValue) && (!(isset($aCriteria['has_undefined'])) || !($aCriteria['has_undefined'])))
{
return "1";
}
@@ -175,7 +184,7 @@ class CriterionToOQL extends CriterionConversionAbstract
$aValues = self::GetValues($aCriteria);
$sValue = self::GetValue($aValues, 0);
if (empty($sValue))
if (self::IsEmpty($sValue))
{
return "1";
}