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

N°1724 - Fix external key search error when an UNION is used as a filter in the datamodel

Browse Source
This commit is contained in:
Eric
2018-11-05 17:43:50 +01:00
parent 95fce0eefb
commit 216d965d76
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -202,7 +202,7 @@ class SearchForm
}
$oBaseSearch = $oSearch->DeepClone();
if (method_exists($oSearch, 'GetCriteria'))
if ($oSearch instanceof DBObjectSearch)
{
$oBaseSearch->ResetCondition();
}
@@ -487,7 +487,7 @@ class SearchForm
$bIsEmptyExpression = true;
$aArgs = MetaModel::PrepareQueryArguments($aArgs, $oSearch->GetInternalParams());
if (method_exists($oSearch, 'GetCriteria'))
if ($oSearch instanceof DBObjectSearch)
{
$oExpression = $oSearch->GetCriteria();