composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-20 09:08:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Portal: Fix OQL exception in ManageBrick when grouping tabs on an attribute (instead of sub OQLs).

Browse Source 
SVN:trunk[5874]
This commit is contained in:
Guillaume Lajarige
2018-06-14 15:10:14 +00:00
parent 5a4375cb71
commit 272acdd8d3
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -376,7 +376,7 @@ class ManageBrickController extends BrickController
{
$oDistinctQuery = $this->GetScopedQuery($oApp, $oBrick, $sClass);
// Adding grouping conditions
$oFieldExp = new FieldExpression($sGroupingAreaAttCode, $sParentAlias);
$oFieldExp = new FieldExpression($sGroupingAreaAttCode, $oDistinctQuery->GetClassAlias());
$sDistinctSql = $oDistinctQuery->MakeGroupByQuery(array(), array('grouped_by_1' => $oFieldExp), true);
$aDistinctResults = CMDBSource::QueryToArray($sDistinctSql);
@@ -851,7 +851,7 @@ class ManageBrickController extends BrickController
{
$oConditionQuery = DBSearch::CloneWithAlias($oQuery, 'GTAB');
$oExpression = new BinaryExpression(new FieldExpression($sGroupingTabAttCode,
$oDistinctQuery->GetClassAlias()), '=', new UnaryExpression($aDistinctResult['grouped_by_1']));
$oConditionQuery->GetClassAlias()), '=', new UnaryExpression($aDistinctResult['grouped_by_1']));
$oConditionQuery->AddConditionExpression($oExpression);
$sHtmlLabel = $oFieldExp->MakeValueLabel($oDistinctQuery, $aDistinctResult['grouped_by_1'], '');
@@ -874,7 +874,7 @@ class ManageBrickController extends BrickController
{
$iOtherCount += $aResult['_itop_count_'];
$oExpr = new BinaryExpression(new FieldExpression($sGroupingTabAttCode,
$oDistinctQuery->GetClassAlias()), '=', new UnaryExpression($aResult['grouped_by_1']));
$oConditionQuery->GetClassAlias()), '=', new UnaryExpression($aResult['grouped_by_1']));
if (is_null($oExpression))
{
$oExpression = $oExpr;

1
datamodels/2.x/itop-portal-base/portal/src/routers/managebrickrouter.class.inc.php
View File

@@ -40,7 +40,6 @@ class ManageBrickRouter extends AbstractRouter
'sDisplayMode' => 'badge|pie-chart|bar-chart|top-list|default'
),
'values' => array(
'sDisplayMode' => 'default',
'sGroupingTab' => null,
)
),