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

N°931: TagSet search form integration

Browse Source
This commit is contained in:
Eric
2018-09-12 15:03:35 +02:00
parent b86b24d444
commit 2ba31244c2
11 changed files with 577 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -928,6 +928,24 @@ class ScalarExpression extends UnaryExpression
IssueLog::Error($e->getMessage());
}
break;
case ($oAttDef instanceof AttributeTagSet):
try
{
if (!empty($this->GetValue()))
{
/** @var AttributeTagSet $oAttDef */
$aValue['label'] = $oAttDef->GetValueLabel($this->GetValue());
}
else
{
$aValue['label'] = Dict::S('Enum:Undefined');
}
}
catch (Exception $e)
{
IssueLog::Error($e->getMessage());
}
break;
case $oAttDef->IsExternalKey():
try
{
@@ -1575,7 +1593,7 @@ class ListExpression extends Expression
{
if ($oExpr instanceof VariableExpression)
{
$this->m_aExpressions[$idx] = $oExpr->GetAsScalar();
$this->m_aExpressions[$idx] = $oExpr->GetAsScalar($aArgs);
}
else
{
@@ -2119,7 +2137,7 @@ class CharConcatExpression extends Expression
{
if ($oExpr instanceof VariableExpression)
{
$this->m_aExpressions[$idx] = $oExpr->GetAsScalar();
$this->m_aExpressions[$idx] = $oExpr->GetAsScalar($aArgs);
}
else
{