composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

N°900 Portal: Fixed wrong count on ManageBrick tabs

Browse Source 
SVN:trunk[4765]
This commit is contained in:
Guillaume Lajarige
2017-06-20 15:28:31 +00:00
parent 4301a5d39d
commit 8b820ce403
1 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -124,6 +124,18 @@ class ManageBrickController extends BrickController
$sGroupingTabAttCode = $aGroupingTabs['attribute'];
$oDistinctQuery = DBSearch::FromOQL($oBrick->GetOql());
// - Restricting query to scope
$oScopeQuery = $oApp['scope_validator']->GetScopeFilterForProfiles(UserRights::ListProfiles(), $oDistinctQuery->GetClass(), UR_ACTION_READ);
if ($oScopeQuery !== null)
{
$oDistinctQuery = $oDistinctQuery->Intersect($oScopeQuery);
// - Allowing all data if necessary
if ($oScopeQuery->IsAllDataAllowed())
{
$oDistinctQuery->AllowAllData();
}
}
// - Adding field condition
$oFieldExp = new FieldExpression($sGroupingTabAttCode, $oDistinctQuery->GetClassAlias());
$sDistinctSql = $oDistinctQuery->MakeGroupByQuery(array(), array('grouped_by_1' => $oFieldExp), true);
$aDistinctResults = CMDBSource::QueryToArray($sDistinctSql);
@@ -162,6 +174,18 @@ class ManageBrickController extends BrickController
foreach ($aGroupingTabs['groups'] as $aGroup)
{
$oConditionQuery = DBSearch::FromOQL($aGroup['condition']);
// - Restricting query to scope
$oScopeQuery = $oApp['scope_validator']->GetScopeFilterForProfiles(UserRights::ListProfiles(), $oConditionQuery->GetClass(), UR_ACTION_READ);
if ($oScopeQuery !== null)
{
$oConditionQuery = $oConditionQuery->Intersect($oScopeQuery);
// - Allowing all data if necessary
if ($oScopeQuery->IsAllDataAllowed())
{
$oConditionQuery->AllowAllData();
}
}
// - Building ObjectSet
$oConditionSet = new DBObjectSet($oConditionQuery);
$aGroupingTabsValues[$aGroup['id']] = array(