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

Customer portal : Fixed exception in ManageBrick that was looking for objects out of its scope

Browse Source 
SVN:trunk[4113]
This commit is contained in:
Guillaume Lajarige
2016-05-23 10:16:43 +00:00
parent f4ff96a552
commit 127d2a3295
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
datamodels/2.x/itop-portal-base/portal/src/controllers/managebrickcontroller.class.inc.php
View File

@@ -192,6 +192,13 @@ class ManageBrickController extends BrickController
if (MetaModel::IsValidAttCode($oQuery->GetClass(), $sGroupingAreaAttCode)) if (MetaModel::IsValidAttCode($oQuery->GetClass(), $sGroupingAreaAttCode))
{ {
$oDistinctQuery = DBSearch::FromOQL($oBrick->GetOql()); $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); $oFieldExp = new FieldExpression($sGroupingAreaAttCode, $sParentAlias);
$sDistinctSql = $oDistinctQuery->MakeGroupByQuery(array(), array('grouped_by_1' => $oFieldExp), true); $sDistinctSql = $oDistinctQuery->MakeGroupByQuery(array(), array('grouped_by_1' => $oFieldExp), true);
$aDistinctResults = CMDBSource::QueryToArray($sDistinctSql); $aDistinctResults = CMDBSource::QueryToArray($sDistinctSql);