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

N°1554: Search form - hide unknown external keys from the search criteria.

Browse Source 
SVN:trunk[6012]
This commit is contained in:
Eric Espié
2018-08-23 12:32:37 +00:00
parent 13097d7e0e
commit 1dfcc77098
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
core/oql/expression.class.inc.php
View File

@@ -812,7 +812,7 @@ class ScalarExpression extends UnaryExpression
$aCriteria['unit'] = 'HOUR';
break;
default:
$aValue = array('value' => $this->GetValue());
$aValue = array();
if (!is_null($oAttDef))
{
switch (true)
@@ -820,11 +820,7 @@ class ScalarExpression extends UnaryExpression
case ($oAttDef instanceof AttributeExternalField):
try
{
if ($this->GetValue() == 0)
{
$aValue['label'] = Dict::S('UI:UndefinedObject');
}
else
if ($this->GetValue() != 0)
{
/** @var AttributeExternalKey $oAttDef */
$sTarget = $oAttDef->GetFinalAttDef()->GetTargetClass();
@@ -841,11 +837,7 @@ class ScalarExpression extends UnaryExpression
case $oAttDef->IsExternalKey():
try
{
if ($this->GetValue() == 0)
{
$aValue['label'] = Dict::S('UI:UndefinedObject');
}
else
if ($this->GetValue() != 0)
{
/** @var AttributeExternalKey $oAttDef */
$sTarget = $oAttDef->GetTargetClass();
@@ -855,7 +847,7 @@ class ScalarExpression extends UnaryExpression
}
catch (Exception $e)
{
IssueLog::Error($e->getMessage());
// This object cannot be seen... ignore
}
break;
default:
@@ -869,7 +861,12 @@ class ScalarExpression extends UnaryExpression
break;
}
}
$aCriteria['values'] = array($aValue);
if (!empty($aValue))
{
// only if a label is found
$aValue['value'] = $this->GetValue();
$aCriteria['values'] = array($aValue);
}
break;
}
$aCriteria['oql'] = $this->Render($aArgs, $bRetrofitParams);