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

Fixed regression introduced with [3912] : autocomplete not working (new User request with lots of existing user requests)

Browse Source 
SVN:trunk[3954]
This commit is contained in:
Romain Quetiez
2016-03-17 14:04:48 +00:00
parent 37e3cb6285
commit c201ae4147
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/dbobjectsearch.class.php
View File

@@ -1074,7 +1074,7 @@ class DBObjectSearch extends DBSearch
$oSQLQuery = $this->MakeSQLObjectQuery($oBuild, null, array());
$oSQLQuery->SetCondition($oBuild->m_oQBExpressions->GetCondition());
$oSQLQuery->SetSelect($oBuild->m_oQBExpressions->GetSelect());
$aScalarArgs = array_merge(MetaModel::PrepareQueryArguments($aArgs), $this->GetInternalParams());
$aScalarArgs = MetaModel::PrepareQueryArguments($aArgs, $this->GetInternalParams());
return $oSQLQuery->RenderDelete($aScalarArgs);
}
@@ -1086,7 +1086,7 @@ class DBObjectSearch extends DBSearch
$oSQLQuery = $this->MakeSQLObjectQuery($oBuild, null, $aValues);
$oSQLQuery->SetCondition($oBuild->m_oQBExpressions->GetCondition());
$oSQLQuery->SetSelect($oBuild->m_oQBExpressions->GetSelect());
$aScalarArgs = array_merge(MetaModel::PrepareQueryArguments($aArgs), $this->GetInternalParams());
$aScalarArgs = MetaModel::PrepareQueryArguments($aArgs, $this->GetInternalParams());
return $oSQLQuery->RenderUpdate($aScalarArgs);
}

2
core/dbsearch.class.php
View File

@@ -377,7 +377,7 @@ abstract class DBSearch
$aAttToLoad = array();
$oSQLQuery = $oQueryFilter->GetSQLQuery(array(), $aArgs, $aAttToLoad, null, 0, 0, false, $aGroupByExpr);
$aScalarArgs = array_merge(MetaModel::PrepareQueryArguments($aArgs), $this->GetInternalParams());
$aScalarArgs = MetaModel::PrepareQueryArguments($aArgs, $this->GetInternalParams());
try
{
$bBeautifulSQL = self::$m_bTraceQueries || self::$m_bDebugQuery || self::$m_bIndentQueries;

7
core/metamodel.class.php
View File

@@ -2456,12 +2456,13 @@ abstract class MetaModel
* - current_user (DBObject)
*
* @param array $aArgs Context arguments (some can be persistent objects)
* @param array $aScalarArgs Other query parameters (only scalars allowed here)
* @param array $aMoreArgs Other query parameters
* @return array
*/
public static function PrepareQueryArguments($aArgs, $aScalarArgs = array())
public static function PrepareQueryArguments($aArgs, $aMoreArgs = array())
{
foreach($aArgs as $sArgName => $value)
$aScalarArgs = array();
foreach(array_merge($aArgs, $aMoreArgs) as $sArgName => $value)
{
if (self::IsValidObject($value))
{