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

Portal : Typo

Browse Source 
SVN:trunk[4411]
This commit is contained in:
Guillaume Lajarige
2016-09-23 13:37:45 +00:00
parent 8e96094977
commit 4dd6c813b1
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -64,7 +64,7 @@ class BrowseBrickController extends BrickController
$aLevelsProperties = array(); $aLevelsProperties = array();
$aLevelsClasses = array(); $aLevelsClasses = array();
static::TreeToFlatLevelsProperties($oApp, $oBrick->GetLevels(), $aLevelsProperties); static::TreeToFlatLevelsProperties($oApp, $oBrick->GetLevels(), $aLevelsProperties);
// Concistency checks // Concistency checks
if (!in_array($sBrowseMode, array_keys($aBrowseModes))) if (!in_array($sBrowseMode, array_keys($aBrowseModes)))
{ {
@@ -281,7 +281,7 @@ class BrowseBrickController extends BrickController
} }
} }
$oSet->OptimizeColumnLoad($aColumnAttrs); $oSet->OptimizeColumnLoad($aColumnAttrs);
// Retrieving results and organizing them for templating // Retrieving results and organizing them for templating
$aItems = array(); $aItems = array();
while ($aCurrentRow = $oSet->FetchAssoc()) while ($aCurrentRow = $oSet->FetchAssoc())
@@ -364,6 +364,12 @@ class BrowseBrickController extends BrickController
// Restricting to the allowed scope // Restricting to the allowed scope
$oScopeSearch = $oApp['scope_validator']->GetScopeFilterForProfiles(UserRights::ListProfiles(), $oSearch->GetClass(), UR_ACTION_READ); $oScopeSearch = $oApp['scope_validator']->GetScopeFilterForProfiles(UserRights::ListProfiles(), $oSearch->GetClass(), UR_ACTION_READ);
$oSearch = ($oScopeSearch !== null) ? $oSearch->Intersect($oScopeSearch) : null; $oSearch = ($oScopeSearch !== null) ? $oSearch->Intersect($oScopeSearch) : null;
// - Allowing all data if necessary
if ($oScopeSearch->IsAllDataAllowed())
{
$oSearch->AllowAllData();
}
if ($oSearch !== null) if ($oSearch !== null)
{ {
$aLevelsProperties[$sCurrentLevelAlias] = array( $aLevelsProperties[$sCurrentLevelAlias] = array(