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

Fixed regression introduced with [3912] and partially fixed in [3954] : when the autocomplete is active, then the search dialog was not working anymore.

Browse Source 
SVN:trunk[3972]
This commit is contained in:
Romain Quetiez
2016-03-30 12:11:57 +00:00
parent 7868c4364c
commit 70e0fab267
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/dbobjectset.class.php
View File

@@ -1072,7 +1072,8 @@ class DBObjectSet
*/
public function ListConstantFields()
{
$aScalarArgs = array_merge($this->m_oFilter->GetInternalParams(), $this->m_aArgs);
// The complete list of arguments will include magic arguments (e.g. current_user->attcode)
$aScalarArgs = MetaModel::PrepareQueryArguments($this->m_oFilter->GetInternalParams(), $this->m_aArgs);
$aConst = $this->m_oFilter->ListConstantFields();
foreach($aConst as $sClassAlias => $aVals)
@@ -1091,7 +1092,7 @@ class DBObjectSet
public function ApplyParameters()
{
$aAllArgs = array_merge($this->m_aArgs, $this->m_oFilter->GetInternalParams());
$aAllArgs = MetaModel::PrepareQueryArguments($this->m_oFilter->GetInternalParams(), $this->m_aArgs);
$this->m_oFilter->ApplyParameters($aAllArgs);
}
}