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

N°1765 - Fix Organization filter and UNION filter in ExternalKey search

Browse Source
This commit is contained in:
Eric
2018-11-16 11:31:36 +01:00
parent 5cedcb2389
commit 9ceb8e9f0b
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -334,8 +334,9 @@ class CriterionToOQL extends CriterionConversionAbstract
// Hierarchical keys // Hierarchical keys
try try
{ {
if ($sHierarchicalKeyCode !== false) if (($sHierarchicalKeyCode !== false) && ($oSearch instanceof DBObjectSearch))
{ {
// NOTE: The hierarchy does not work for unions for now. It'll be done with the full support of unions in search.
// Add all the joins for hierarchical key // Add all the joins for hierarchical key
$oFilter = new DBObjectSearch($sTargetClass); $oFilter = new DBObjectSearch($sTargetClass);
$sFilterAlias = $oFilter->GetClassAlias(); $sFilterAlias = $oFilter->GetClassAlias();