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

Remove deprecied function $oField->Render replaced by $oField->RenderExpression()

Browse Source
This commit is contained in:
acognet
2022-01-18 15:32:21 +01:00
parent 06af788480
commit 4fdf8803a5
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/displayblock.class.inc.php
View File

@@ -853,7 +853,7 @@ JS
{
$oField = new FieldExpression($sFilterCode, $oFilter->GetClassAlias());
$sListExpr = '('.implode(', ', CMDBSource::Quote($condition)).')';
$sOQLCondition = $oField->Render()." IN $sListExpr";
$sOQLCondition = $oField->RenderExpression()." IN $sListExpr";
$oNewCondition = Expression::FromOQL($sOQLCondition);
return $oNewCondition;
}

2
application/ui.linksdirectwidget.class.inc.php
View File

@@ -296,7 +296,7 @@ class UILinksWidgetDirect
}
$oHiddenCriteria = $oHiddenFilter->GetCriteria();
$aArgs = $oHiddenFilter->GetInternalParams();
$sHiddenCriteria = $oHiddenCriteria->Render($aArgs);
$sHiddenCriteria = $oHiddenCriteria->RenderExpression(false, $aArgs);
$oLinkSetDef = MetaModel::GetAttributeDef($this->sClass, $this->sAttCode);
$valuesDef = $oLinkSetDef->GetValuesDef();

2
core/cmdbchangeop.class.inc.php
View File

@@ -1077,7 +1077,7 @@ class CMDBChangeOpSetAttributeLinksTune extends CMDBChangeOpSetAttributeLinks
{
$oField = new FieldExpression('objclass', $oSearch->GetClassAlias());
$sListExpr = '('.implode(', ', CMDBSource::Quote($aLinkClasses)).')';
$sOQLCondition = $oField->Render()." IN $sListExpr";
$sOQLCondition = $oField->RenderExpression()." IN $sListExpr";
$oNewCondition = Expression::FromOQL($sOQLCondition);
$oSearch->AddConditionExpression($oNewCondition);
}

8
core/dbobjectsearch.class.php
View File

@@ -465,14 +465,14 @@ class DBObjectSearch extends DBSearch
if (!is_array($value)) $value = array($value);
if (count($value) === 0) throw new Exception('AddCondition '.$sOpCode.': Value cannot be an empty array.');
$sListExpr = '('.implode(', ', CMDBSource::Quote($value)).')';
$sOQLCondition = $oField->Render()." IN $sListExpr";
$sOQLCondition = $oField->RenderExpression()." IN $sListExpr";
break;
case 'NOTIN':
if (!is_array($value)) $value = array($value);
if (count($value) === 0) throw new Exception('AddCondition '.$sOpCode.': Value cannot be an empty array.');
$sListExpr = '('.implode(', ', CMDBSource::Quote($value)).')';
$sOQLCondition = $oField->Render()." NOT IN $sListExpr";
$sOQLCondition = $oField->RenderExpression()." NOT IN $sListExpr";
break;
case 'Contains':
@@ -1368,7 +1368,7 @@ class DBObjectSearch extends DBSearch
public function GetQueryParams($bExcludeMagicParams = true)
{
$aParams = array();
$this->m_oSearchCondition->Render($aParams, true);
$this->m_oSearchCondition->RenderExpression(false, $aParams, true);
if ($bExcludeMagicParams)
{
@@ -1457,7 +1457,7 @@ class DBObjectSearch extends DBSearch
$sRes .= ' ' . $this->GetFirstJoinedClass() . ' AS `' . $this->GetFirstJoinedClassAlias() . '`';
$sRes .= $this->ToOQL_Joins();
$sRes .= " WHERE ".$this->m_oSearchCondition->Render($aParams, $bRetrofitParams);
$sRes .= " WHERE ".$this->m_oSearchCondition->RenderExpression(false, $aParams, $bRetrofitParams);
if ($bWithAllowAllFlag && $this->m_bAllowAllData)
{

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

@@ -413,7 +413,7 @@ class CriterionToOQL extends CriterionConversionAbstract
$oCriteria = $oSearch->GetCriteria();
$aArgs = MetaModel::PrepareQueryArguments(array(), $oSearch->GetInternalParams(), $oSearch->GetExpectedArguments() );
$oSearch->ResetCondition();
$sCondition = $oCriteria->Render($aArgs);
$sCondition = $oCriteria->RenderExpression(false, $aArgs);
}
} catch (Exception $e)
{