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

Advanced Search: resolve variables for the search screen

Browse Source 
SVN:b1162[5488]
This commit is contained in:
Eric Espié
2018-03-21 13:45:37 +00:00
parent b05b41c7cc
commit 3cdf22e9b2
2 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,6 +34,14 @@ abstract class Expression
// recursive translation of identifiers
abstract public function GetUnresolvedFields($sAlias, &$aUnresolved);
/**
* @param array $aTranslationData
* @param bool $bMatchAll
* @param bool $bMarkFieldsAsResolved
*
* @return Expression Translated expression
*/
abstract public function Translate($aTranslationData, $bMatchAll = true, $bMarkFieldsAsResolved = true);
// recursive rendering (aArgs used as input by default, or used as output if bRetrofitParams set to True

23
sources/application/search/searchform.class.inc.php
View File

@@ -122,9 +122,18 @@ class SearchForm
$sHtml .= "<div id=\"fs_{$sSearchFormId}_criterion_outer\">\n</div>\n";
$sHtml .= "</form>\n";
if (isset($aExtraParams['query_params']))
{
$aArgs = $aExtraParams['query_params'];
}
else
{
$aArgs = array();
}
$aFields = $this->GetFields($oSet);
$oSearch = $oSet->GetFilter();
$aCriterion = $this->GetCriterion($oSearch, $aFields);
$aCriterion = $this->GetCriterion($oSearch, $aFields, $aArgs);
$oBaseSearch = $oSearch->DeepClone();
$oBaseSearch->ResetCondition();
@@ -284,12 +293,22 @@ class SearchForm
* @param \DBSearch $oSearch
* @param array $aFields
*
* @param array $aArgs
*
* @return array
*/
public function GetCriterion($oSearch, $aFields)
public function GetCriterion($oSearch, $aFields, $aArgs = array())
{
$oExpression = $oSearch->GetCriteria();
if (!empty($aArgs))
{
$aArgs = MetaModel::PrepareQueryArguments($aArgs);
$sOQL = $oExpression->Render($aArgs);
$oExpression = Expression::FromOQL($sOQL);
}
$aOrCriterion = array();
$aORExpressions = Expression::Split($oExpression, 'OR');
foreach($aORExpressions as $oORSubExpr)