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

Fix count with Archive mode

Browse Source
This commit is contained in:
Eric
2019-10-11 22:06:42 +02:00
parent 4c386da7d2
commit 75794fb4d9
3 changed files with 304 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
core/sqlobjectquerybuilder.class.inc.php
View File

@@ -102,6 +102,18 @@ class SQLObjectQueryBuilder
return $oOQLClassNode;
}
/**
*
* @param \QueryBuilderContext $oBuild The builder will be unusable after that
*
* @return string
* @throws \CoreException
*/
public function DebugOQLClassTree($oBuild)
{
return $this->GetOQLClassTree($oBuild)->RenderDebug();
}
/**
* @param \QueryBuilderContext $oBuild
@@ -264,12 +276,8 @@ class SQLObjectQueryBuilder
{
if (!$oBuild->GetRootFilter()->GetArchiveMode())
{
$bIsOnJoinedClass = array_key_exists($sClassAlias, $oBuild->GetRootFilter()->GetJoinedClasses());
if ($bIsOnJoinedClass)
{
$oNotArchived = new BinaryExpression(new FieldExpressionResolved('archive_flag', $sClassAlias), '=', new ScalarExpression(0));
$oBuild->AddFilteredTable($sClassAlias, $oNotArchived);
}
$oNotArchived = new BinaryExpression(new FieldExpressionResolved('archive_flag', $sClassAlias), '=', new ScalarExpression(0));
$oBuild->AddFilteredTable($sClassAlias, $oNotArchived);
}
}
@@ -288,4 +296,4 @@ class SQLObjectQueryBuilder
return $oBaseSQLQuery;
}
}
}