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

Changes GetAsCSV() to AttributeEnum->GetValueLabel()

Browse Source
This commit is contained in:
Anne-Cath
2026-06-22 17:08:05 +02:00
parent 4597cc00fa
commit 81e9ef80f2
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/ui.extkeywidget.class.inc.php
View File

@@ -284,8 +284,8 @@ class UIExtKeyWidget
if ($bAddingValue) {
$aArguments = [];
foreach ($aAdditionalField as $sAdditionalField) {
//getAsCSV to have user friendly value in text format
array_push($aArguments, $oObj->GetAsCSV($sAdditionalField, ' ', ''));
$oAttrDef = MetaModel::GetAttributeDef(get_class($oObj), $sAdditionalField);
array_push($aArguments, $oAttrDef->GetValueLabel($oObj->Get($sAdditionalField)));
}
$aOption['additional_field'] = utils::HtmlEntities(utils::VSprintf($sFormatAdditionalField, $aArguments));
}

4
core/valuesetdef.class.inc.php
View File

@@ -404,8 +404,8 @@ class ValueSetObjects extends ValueSetDefinition
if (count($aAdditionalField) > 0) {
$aArguments = [];
foreach ($aAdditionalField as $sAdditionalField) {
//getAsCSV to have user friendly value in text format
array_push($aArguments, $oObject->GetAsCSV($sAdditionalField,' ',''));
$oAttrDef = MetaModel::GetAttributeDef(get_class($oObject), $sAdditionalField);
array_push($aArguments, $oAttrDef->GetValueLabel($oObject->Get($sAdditionalField)));
}
$aData['additional_field'] = utils::VSprintf($sFormatAdditionalField, $aArguments);
} else {

4
sources/Service/Base/ObjectRepository.php
View File

@@ -210,8 +210,8 @@ class ObjectRepository
$aData['has_additional_field'] = true;
$aArguments = [];
foreach ($aComplementAttributeSpec[1] as $sAdditionalField) {
//getAsCSV to have user friendly value in text format
$aArguments[] = $oDbObject->GetAsCSV($sAdditionalField,' ','');
$oAttrDef = MetaModel::GetAttributeDef(get_class($oDbObject), $sAdditionalField);
$aArguments[] = $oAttrDef->GetValueLabel($oDbObject->Get($sAdditionalField));
}
$aData['additional_field'] = utils::VSprintf($aComplementAttributeSpec[0], $aArguments);
$sAdditionalFieldForHtml = utils::EscapeHtml($aData['additional_field']);