From 4dd6c813b1604060022ddb9d13a7070a05b8e784 Mon Sep 17 00:00:00 2001 From: Guillaume Lajarige Date: Fri, 23 Sep 2016 13:37:45 +0000 Subject: [PATCH] Portal : Typo SVN:trunk[4411] --- .../controllers/browsebrickcontroller.class.inc.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/datamodels/2.x/itop-portal-base/portal/src/controllers/browsebrickcontroller.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/controllers/browsebrickcontroller.class.inc.php index b56dfaa3cb..03530bbfc7 100644 --- a/datamodels/2.x/itop-portal-base/portal/src/controllers/browsebrickcontroller.class.inc.php +++ b/datamodels/2.x/itop-portal-base/portal/src/controllers/browsebrickcontroller.class.inc.php @@ -64,7 +64,7 @@ class BrowseBrickController extends BrickController $aLevelsProperties = array(); $aLevelsClasses = array(); static::TreeToFlatLevelsProperties($oApp, $oBrick->GetLevels(), $aLevelsProperties); - + // Concistency checks if (!in_array($sBrowseMode, array_keys($aBrowseModes))) { @@ -281,7 +281,7 @@ class BrowseBrickController extends BrickController } } $oSet->OptimizeColumnLoad($aColumnAttrs); - + // Retrieving results and organizing them for templating $aItems = array(); while ($aCurrentRow = $oSet->FetchAssoc()) @@ -364,6 +364,12 @@ class BrowseBrickController extends BrickController // Restricting to the allowed scope $oScopeSearch = $oApp['scope_validator']->GetScopeFilterForProfiles(UserRights::ListProfiles(), $oSearch->GetClass(), UR_ACTION_READ); $oSearch = ($oScopeSearch !== null) ? $oSearch->Intersect($oScopeSearch) : null; + // - Allowing all data if necessary + if ($oScopeSearch->IsAllDataAllowed()) + { + $oSearch->AllowAllData(); + } + if ($oSearch !== null) { $aLevelsProperties[$sCurrentLevelAlias] = array(