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

Internal: Simplify classes FQN

Browse Source
This commit is contained in:
Molkobain
2019-12-24 15:08:10 +01:00
parent 4ddb23cd7c
commit 17978b829b
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,7 +20,9 @@
namespace Combodo\iTop\Portal\Controller; namespace Combodo\iTop\Portal\Controller;
use AttributeLinkedSetIndirect;
use Combodo\iTop\Portal\Helper\BrowseBrickHelper; use Combodo\iTop\Portal\Helper\BrowseBrickHelper;
use DBObjectSearch;
use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
@@ -133,10 +135,10 @@ class BrowseBrickController extends BrickController
$aRealiasingMap = array(); $aRealiasingMap = array();
$oParentAtt = MetaModel::GetAttributeDef($aLevelsProperties[$aLevelsPropertiesKeys[$i + 1]]['search']->GetClass(), $aLevelsProperties[$aLevelsPropertiesKeys[$i + 1]]['parent_att']); $oParentAtt = MetaModel::GetAttributeDef($aLevelsProperties[$aLevelsPropertiesKeys[$i + 1]]['search']->GetClass(), $aLevelsProperties[$aLevelsPropertiesKeys[$i + 1]]['parent_att']);
// If we work on a n:n link // If we work on a n:n link
if($oParentAtt instanceof \AttributeLinkedSetIndirect) if($oParentAtt instanceof AttributeLinkedSetIndirect)
{ {
// Create a DBSearch from Link class // Create a DBSearch from Link class
$oSubSearch = new \DBObjectSearch($oParentAtt->GetLinkedClass()); $oSubSearch = new DBObjectSearch($oParentAtt->GetLinkedClass());
// Join it to the bottom query // Join it to the bottom query
$oSubSearch = $oSubSearch->Join($aLevelsProperties[$aLevelsPropertiesKeys[$i + 1]]['search'], $oSubSearch = $oSubSearch->Join($aLevelsProperties[$aLevelsPropertiesKeys[$i + 1]]['search'],
DBSearch::JOIN_POINTING_TO, $oParentAtt->GetExtKeyToMe(), TREE_OPERATOR_EQUALS, $aRealiasingMap); DBSearch::JOIN_POINTING_TO, $oParentAtt->GetExtKeyToMe(), TREE_OPERATOR_EQUALS, $aRealiasingMap);
@@ -332,7 +334,7 @@ class BrowseBrickController extends BrickController
{ {
$sParentAttCode = $aLevelsProperties[$aLevelProperties['levels'][0]]['parent_att']; $sParentAttCode = $aLevelsProperties[$aLevelProperties['levels'][0]]['parent_att'];
$oParentAtt = MetaModel::GetAttributeDef($oQuery->GetClass(), $sParentAttCode); $oParentAtt = MetaModel::GetAttributeDef($oQuery->GetClass(), $sParentAttCode);
if($oParentAtt instanceof \AttributeLinkedSetIndirect) if($oParentAtt instanceof AttributeLinkedSetIndirect)
{ {
$oQuery->AddConditionAdvanced($sParentAttCode.'->'.$oParentAtt->GetExtKeyToRemote(), $sNodeId); $oQuery->AddConditionAdvanced($sParentAttCode.'->'.$oParentAtt->GetExtKeyToRemote(), $sNodeId);
} }