From 81e9ef80f28eb0bea827057a1903cb6b59c20bea Mon Sep 17 00:00:00 2001 From: Anne-Cath Date: Mon, 22 Jun 2026 17:08:05 +0200 Subject: [PATCH] Changes GetAsCSV() to AttributeEnum->GetValueLabel() --- application/ui.extkeywidget.class.inc.php | 4 ++-- core/valuesetdef.class.inc.php | 4 ++-- sources/Service/Base/ObjectRepository.php | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/application/ui.extkeywidget.class.inc.php b/application/ui.extkeywidget.class.inc.php index c2b166542a..386c061ff7 100644 --- a/application/ui.extkeywidget.class.inc.php +++ b/application/ui.extkeywidget.class.inc.php @@ -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)); } diff --git a/core/valuesetdef.class.inc.php b/core/valuesetdef.class.inc.php index 24b46be05e..82f4fdfaf3 100644 --- a/core/valuesetdef.class.inc.php +++ b/core/valuesetdef.class.inc.php @@ -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 { diff --git a/sources/Service/Base/ObjectRepository.php b/sources/Service/Base/ObjectRepository.php index 19bdfd9b2e..e69ca89a2f 100644 --- a/sources/Service/Base/ObjectRepository.php +++ b/sources/Service/Base/ObjectRepository.php @@ -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']);