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

Merge remote-tracking branch 'origin/support/2.5' into release/2.6

Browse Source
This commit is contained in:
Eric
2018-11-16 11:33:33 +01:00
parent 1db9708624 9ceb8e9f0b
commit 9169cced20
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

@@ -387,8 +387,9 @@ class CriterionToOQL extends CriterionConversionAbstract
// Hierarchical keys
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
$oFilter = new DBObjectSearch($sTargetClass);
$sFilterAlias = $oFilter->GetClassAlias();