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

N°971 Portal: Fix Browse brick n:n level links in tree and mosaic display

Browse Source
This commit is contained in:
Stephen Abello
2019-11-26 11:35:14 +01:00
parent c0f82f25a3
commit ff3c7ebe54
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
datamodels/2.x/itop-portal-base/portal/src/Controller/BrowseBrickController.php
View File

@@ -314,7 +314,16 @@ class BrowseBrickController extends BrickController
$oQuery = $aLevelsProperties[$aLevelProperties['levels'][0]]['search'];
if (!empty($sNodeId))
{
$oQuery->AddCondition($aLevelsProperties[$aLevelProperties['levels'][0]]['parent_att'], $sNodeId);
$sParentAttCode = $aLevelsProperties[$aLevelProperties['levels'][0]]['parent_att'];
$oParentAtt = MetaModel::GetAttributeDef($oQuery->GetClass(), $sParentAttCode);
if($oParentAtt instanceof \AttributeLinkedSetIndirect)
{
$oQuery->AddConditionAdvanced($sParentAttCode.'->'.$oParentAtt->GetExtKeyToRemote(), $sNodeId);
}
else
{
$oQuery->AddCondition($sParentAttCode, $sNodeId);
}
}
$bFoundLevel = true;
break;