Merge remote-tracking branch 'refs/remotes/origin/support/3.1' into support/3.2

This commit is contained in:
jf-cbd
2024-04-24 17:11:19 +02:00
6 changed files with 176 additions and 7 deletions

View File

@@ -1695,7 +1695,7 @@ JS
$sHtmlValue = $oGroupByExp->MakeValueLabel($this->m_oFilter, $sValue, $sValue);
$iTotalCount += $aRow['_itop_count_'];
$aValues[] = array(
'label' => html_entity_decode(strip_tags($sHtmlValue), ENT_QUOTES, 'UTF-8'),
'label' => $sValue,
'label_html' => $sHtmlValue,
'value' => (float)$aRow[$sFctVar],
);