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

Fix group by error

Browse Source
This commit is contained in:
Eric Espie
2026-01-22 13:33:41 +01:00
parent fe4b2a0d93
commit ce263ae97b
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -984,7 +984,7 @@ JS
$aFunctions = [$sFctVar => $oFctExpr];
}
if (!empty($sAggregationAttr)) {
if (!empty(trim($sAggregationAttr))) {
$sClass = $this->m_oFilter->GetClass();
$sAggregationAttr = MetaModel::GetLabel($sClass, $sAggregationAttr);
}
@@ -1608,10 +1608,9 @@ JS
$iTotalCount = 0;
$aURLs = [];
foreach ($aRes as $iRow => $aRow) {
foreach ($aRes as $aRow) {
$sValue = $aRow['grouped_by_1'];
$sHtmlValue = $oGroupByExp->MakeValueLabel($this->m_oFilter, $sValue, $sValue);
$iTotalCount += $aRow['_itop_count_'];
$aValues[] = [
'label' => html_entity_decode(strip_tags($sHtmlValue), ENT_QUOTES, 'UTF-8'),
'label_html' => $sHtmlValue,

2
sources/PropertyType/ValueType/AbstractValueType.php
View File

@@ -246,6 +246,6 @@ PHP;
public function DeserializeFromDOMNode(DesignElement $oDOMNode): mixed
{
return $oDOMNode->GetText();
return trim($oDOMNode->GetText());
}
}