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

Advanced Search: Labels on raw expressions

Browse Source 
SVN:b1162[5454]
This commit is contained in:
Eric Espié
2018-03-19 09:57:31 +00:00
parent f8f6e201b9
commit 8f858c2ddf
1 changed files with 6 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,7 +47,10 @@ abstract class Expression
*
* @return array parameters for the search form
*/
abstract public function Display($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null);
public function Display($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
{
return $this->Render($aArgs, $bRetrofitParams);
}
/**
* Recursively browse the expression tree
@@ -159,6 +162,7 @@ abstract class Expression
return array(
'widget' => AttributeDefinition::SEARCH_WIDGET_TYPE,
'oql' => $this->Render($aArgs, $bRetrofitParams),
'label' => $this->Display($oSearch, $aArgs, $bRetrofitParams, $oAttDef),
'source' => get_class($this),
);
}
@@ -202,11 +206,6 @@ class SQLExpression extends Expression
return false;
}
public function Display($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
{
return $this->Render($aArgs, $bRetrofitParams);
}
// recursive rendering
public function Render(&$aArgs = null, $bRetrofitParams = false)
{
@@ -504,6 +503,7 @@ class BinaryExpression extends Expression
$aCriteria['operator'] = $this->GetOperator();
}
$aCriteria['oql'] = $this->Render($aArgs, $bRetrofitParams);
$aCriteria['label'] = $this->Display($oSearch, $aArgs, $bRetrofitParams, $oAttDef);
return $aCriteria;
}
@@ -530,11 +530,6 @@ class UnaryExpression extends Expression
return $this->m_value;
}
public function Display($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
{
return $this->Render($aArgs, $bRetrofitParams);
}
// recursive rendering
public function Render(&$aArgs = null, $bRetrofitParams = false)
{
@@ -1149,11 +1144,6 @@ class ListExpression extends Expression
return $this->m_aExpressions;
}
public function Display($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
{
return $this->Render($aArgs, $bRetrofitParams);
}
// recursive rendering
public function Render(&$aArgs = null, $bRetrofitParams = false)
{
@@ -1299,11 +1289,6 @@ class FunctionExpression extends Expression
return $this->m_aArgs;
}
public function Display($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
{
return $this->Render($aArgs, $bRetrofitParams);
}
// recursive rendering
public function Render(&$aArgs = null, $bRetrofitParams = false)
{
@@ -1502,11 +1487,6 @@ class IntervalExpression extends Expression
return $this->m_sUnit;
}
public function Display($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
{
return $this->Render($aArgs, $bRetrofitParams);
}
// recursive rendering
public function Render(&$aArgs = null, $bRetrofitParams = false)
{
@@ -1586,11 +1566,6 @@ class CharConcatExpression extends Expression
return $this->m_aExpressions;
}
public function Display($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
{
return $this->Render($aArgs, $bRetrofitParams);
}
// recursive rendering
public function Render(&$aArgs = null, $bRetrofitParams = false)
{
@@ -1703,10 +1678,6 @@ class CharConcatWSExpression extends CharConcatExpression
parent::__construct($aExpressions);
}
public function Display($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
{
return $this->Render($aArgs, $bRetrofitParams);
}
// recursive rendering
public function Render(&$aArgs = null, $bRetrofitParams = false)
{