From 127d2a32955d3ea0c457c57117206f91715dcf31 Mon Sep 17 00:00:00 2001 From: Guillaume Lajarige Date: Mon, 23 May 2016 10:16:43 +0000 Subject: [PATCH] Customer portal : Fixed exception in ManageBrick that was looking for objects out of its scope SVN:trunk[4113] --- .../src/controllers/managebrickcontroller.class.inc.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/datamodels/2.x/itop-portal-base/portal/src/controllers/managebrickcontroller.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/controllers/managebrickcontroller.class.inc.php index d002defda8..2d82d83dbf 100644 --- a/datamodels/2.x/itop-portal-base/portal/src/controllers/managebrickcontroller.class.inc.php +++ b/datamodels/2.x/itop-portal-base/portal/src/controllers/managebrickcontroller.class.inc.php @@ -192,6 +192,13 @@ class ManageBrickController extends BrickController if (MetaModel::IsValidAttCode($oQuery->GetClass(), $sGroupingAreaAttCode)) { $oDistinctQuery = DBSearch::FromOQL($oBrick->GetOql()); + // Checking if there is a scope to apply + $oDistinctScopeQuery = $oApp['scope_validator']->GetScopeFilterForProfiles(UserRights::ListProfiles(), $oQuery->GetClass(), UR_ACTION_READ); + if ($oDistinctScopeQuery != null) + { + $oDistinctQuery = $oDistinctQuery->Intersect($oDistinctScopeQuery); + } + // Adding grouping conditions $oFieldExp = new FieldExpression($sGroupingAreaAttCode, $sParentAlias); $sDistinctSql = $oDistinctQuery->MakeGroupByQuery(array(), array('grouped_by_1' => $oFieldExp), true); $aDistinctResults = CMDBSource::QueryToArray($sDistinctSql);