composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-23 10:38:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°3823 - Error on "Header with statistics dashlet" with autorefresh and filter on organization

Browse Source
This commit is contained in:
acognet
2021-03-18 14:50:18 +01:00
parent 3959ed505b
commit 82a5ab5aef
4 changed files with 37 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
application/displayblock.class.inc.php
View File

@@ -608,18 +608,17 @@ HTML;
foreach($aTemp as $sTemp)
{
$aMatches = array();
if (preg_match('/^([+-])?(.+)$/', $sTemp, $aMatches))
{
if (preg_match('/^([+-])?(.+)$/', $sTemp, $aMatches)) {
$bAscending = true;
if ($aMatches[1] == '-')
{
$bAscending = false;
if ($aMatches[1] == '-') {
$bAscending = false;
}
$aOrderBy[$aMatches[2]] = $bAscending;
}
}
}
}
$aExtraParams['query_params'] = $this->m_oFilter->GetInternalParams();
$this->m_oSet = new CMDBObjectSet($this->m_oFilter, $aOrderBy, $aQueryParams);
}
$this->m_oSet->SetShowObsoleteData($this->m_bShowObsoleteData);
@@ -1167,8 +1166,9 @@ JS
);
$sFormat = isset($aExtraParams['format']) ? $aExtraParams['format'] : 'UI:Pagination:HeaderNoSelection';
$sTitle = Dict::Format($sFormat, $iTotalCount);
$oBlock = DataTableUIBlockFactory::MakeForStaticData($sTitle, $aAttribs, $aData, null, $aExtraParams,
$this->m_oFilter->ToOQL());
$aExtraParams['query_params'] = $this->m_oFilter->GetInternalParams();
$oBlock = DataTableUIBlockFactory::MakeForStaticData($sTitle, $aAttribs, $aData, null, $aExtraParams, $this->m_oFilter->ToOQL());
} else {
// Simply count the number of elements in the set