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°1429: Dashlet header statistics fix corresponding search criteria

Browse Source 
SVN:trunk[5805]
This commit is contained in:
Eric Espié
2018-05-22 14:57:05 +00:00
parent bef8fd566f
commit a4459901e8
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
application/dashlet.class.inc.php
View File

@@ -1712,12 +1712,7 @@ class DashletHeaderDynamic extends Dashlet
if (isset($sClass) && $this->oModelReflection->IsValidAttCode($sClass, $this->aProperties['group_by']))
{
$aValues = $this->oModelReflection->GetAllowedValues_att($sClass, $this->aProperties['group_by']);
$aNewValues = array();
foreach($aValues as $sKey => $sValue)
{
$aNewValues[$sKey] = html_entity_decode($sValue, ENT_QUOTES);
}
$oField->SetAllowedValues($aNewValues);
$oField->SetAllowedValues($aValues);
}
else
{

2
core/attributedef.class.inc.php
View File

@@ -3835,7 +3835,7 @@ class AttributeEnum extends AttributeString
$aLocalizedValues = array();
foreach ($aRawValues as $sKey => $sValue)
{
$aLocalizedValues[$sKey] = Str::pure2html($this->GetValueLabel($sKey));
$aLocalizedValues[$sKey] = $this->GetValueLabel($sKey);
}
return $aLocalizedValues;
}