Skip to content

N°6327 - Enum, Date, FinalClass in Complementary Name not labelized #783

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
accognet wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

N°6327 - Enum, Date, FinalClass in Complementary Name not labelized #783

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
05deaf3
N°6327 - Enum, Date, FinalClass in Complementary Name not labelized
accognet Dec 4, 2025
3a3519c
Update dictionaries/nl.dictionary.itop.core.php
accognet Dec 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion application/ui.extkeywidget.class.inc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,8 @@ public function DisplaySelect(WebPage $oPage, $iMaxComboLength, $bAllowTargetCre
if ($bAddingValue) {
$aArguments = [];
foreach ($aAdditionalField as $sAdditionalField) {
array_push($aArguments, $oObj->Get($sAdditionalField));
//getAsCSV to have user friendly value in text format
array_push($aArguments, $oObj->GetAsCSV($sAdditionalField, ' ', ''));
}
$aOption['additional_field'] = utils::HtmlEntities(utils::VSprintf($sFormatAdditionalField, $aArguments));
}
Expand Down
24 changes: 12 additions & 12 deletions core/trigger.class.inc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public static function Init()
"category" => "grant_by_profile,core/cmdb",
"key_type" => "autoincrement",
"name_attcode" => "description",
"complementary_name_attcode" => ['finalclass', 'complement'],
"complementary_name_attcode" => ['finalclass', 'target_class'],
"state_attcode" => "",
"reconc_keys" => ['description'],
"db_table" => "priv_trigger",
Expand Down Expand Up @@ -174,7 +174,7 @@ public static function Init()
"category" => "grant_by_profile,core/cmdb",
"key_type" => "autoincrement",
"name_attcode" => "description",
"complementary_name_attcode" => ['finalclass', 'complement'],
"complementary_name_attcode" => ['finalclass', 'target_class'],
"state_attcode" => "",
"reconc_keys" => ['description'],
"db_table" => "priv_trigger_onobject",
Expand Down Expand Up @@ -401,7 +401,7 @@ public static function Init()
"category" => "grant_by_profile,core/cmdb,application",
"key_type" => "autoincrement",
"name_attcode" => "description",
"complementary_name_attcode" => ['finalclass', 'complement'],
"complementary_name_attcode" => ['finalclass', 'target_class'],
"state_attcode" => "",
"reconc_keys" => ['description'],
"db_table" => "priv_trigger_onportalupdate",
Expand Down Expand Up @@ -434,7 +434,7 @@ public static function Init()
"category" => "grant_by_profile,core/cmdb",
"key_type" => "autoincrement",
"name_attcode" => "description",
"complementary_name_attcode" => ['finalclass', 'complement'],
"complementary_name_attcode" => ['finalclass', 'target_class'],
"state_attcode" => "",
"reconc_keys" => ['description'],
"db_table" => "priv_trigger_onstatechange",
Expand Down Expand Up @@ -469,7 +469,7 @@ public static function Init()
"category" => "grant_by_profile,core/cmdb,application",
"key_type" => "autoincrement",
"name_attcode" => "description",
"complementary_name_attcode" => ['finalclass', 'complement'],
"complementary_name_attcode" => ['finalclass', 'target_class'],
"state_attcode" => "",
"reconc_keys" => ['description'],
"db_table" => "priv_trigger_onstateenter",
Expand Down Expand Up @@ -503,7 +503,7 @@ public static function Init()
"category" => "grant_by_profile,core/cmdb,application",
"key_type" => "autoincrement",
"name_attcode" => "description",
"complementary_name_attcode" => ['finalclass', 'complement'],
"complementary_name_attcode" => ['finalclass', 'target_class'],
"state_attcode" => "",
"reconc_keys" => ['description'],
"db_table" => "priv_trigger_onstateleave",
Expand Down Expand Up @@ -537,7 +537,7 @@ public static function Init()
"category" => "grant_by_profile,core/cmdb,application",
"key_type" => "autoincrement",
"name_attcode" => "description",
"complementary_name_attcode" => ['finalclass', 'complement'],
"complementary_name_attcode" => ['finalclass', 'target_class'],
"state_attcode" => "",
"reconc_keys" => ['description'],
"db_table" => "priv_trigger_onobjcreate",
Expand Down Expand Up @@ -572,7 +572,7 @@ public static function Init()
"category" => "grant_by_profile,core/cmdb,application",
"key_type" => "autoincrement",
"name_attcode" => "description",
"complementary_name_attcode" => ['finalclass', 'complement'],
"complementary_name_attcode" => ['finalclass', 'target_class'],
"state_attcode" => "",
"reconc_keys" => ['description'],
"db_table" => "priv_trigger_onobjdelete",
Expand Down Expand Up @@ -607,7 +607,7 @@ public static function Init()
"category" => "grant_by_profile,core/cmdb,application",
"key_type" => "autoincrement",
"name_attcode" => "description",
"complementary_name_attcode" => ['finalclass', 'complement'],
"complementary_name_attcode" => ['finalclass', 'target_class'],
"state_attcode" => "",
"reconc_keys" => ['description'],
"db_table" => "priv_trigger_onobjupdate",
Expand Down Expand Up @@ -695,7 +695,7 @@ public static function Init()
"category" => "grant_by_profile,core/cmdb,application",
"key_type" => "autoincrement",
"name_attcode" => "description",
"complementary_name_attcode" => ['finalclass', 'complement'],
"complementary_name_attcode" => ['finalclass', 'target_class'],
"state_attcode" => "",
"reconc_keys" => ['description'],
"db_table" => "priv_trigger_onobjmention",
Expand Down Expand Up @@ -773,7 +773,7 @@ public static function Init()
"category" => "grant_by_profile,core/cmdb,application",
"key_type" => "autoincrement",
"name_attcode" => "description",
"complementary_name_attcode" => ['finalclass', 'complement'],
"complementary_name_attcode" => ['finalclass', 'target_class'],
"state_attcode" => "",
"reconc_keys" => ['description'],
"db_table" => "priv_trigger_onattblobdownload",
Expand Down Expand Up @@ -852,7 +852,7 @@ public static function Init()
"category" => "grant_by_profile,core/cmdb,application",
"key_type" => "autoincrement",
"name_attcode" => "description",
"complementary_name_attcode" => ['finalclass', 'complement'],
"complementary_name_attcode" => ['finalclass', 'target_class'],
"state_attcode" => "",
"reconc_keys" => ['description'],
"db_table" => "priv_trigger_threshold",
Expand Down
3 changes: 2 additions & 1 deletion core/valuesetdef.class.inc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,8 @@ protected function LoadValuesForAutocomplete($aArgs, $sContains = '', $sOperatio
if (count($aAdditionalField) > 0) {
$aArguments = [];
foreach ($aAdditionalField as $sAdditionalField) {
array_push($aArguments, $oObject->Get($sAdditionalField));
//getAsCSV to have user friendly value in text format
array_push($aArguments, $oObject->GetAsCSV($sAdditionalField,' ',''));
}
$aData['additional_field'] = utils::VSprintf($sFormatAdditionalField, $aArguments);
} else {
Expand Down
2 changes: 1 addition & 1 deletion datamodels/2.x/itop-attachments/src/Trigger/TriggerOnAttachmentCreate.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public static function Init()
"category" => "grant_by_profile,core/cmdb,application",
"key_type" => "autoincrement",
"name_attcode" => "description",
"complementary_name_attcode" => ['finalclass', 'complement'],
"complementary_name_attcode" => ['finalclass', 'target_class'],
"state_attcode" => "",
"reconc_keys" => ['description'],
"db_table" => "priv_trigger_onattcreate",
Expand Down
2 changes: 1 addition & 1 deletion datamodels/2.x/itop-attachments/src/Trigger/TriggerOnAttachmentDelete.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public static function Init()
"category" => "grant_by_profile,core/cmdb,application",
"key_type" => "autoincrement",
"name_attcode" => "description",
"complementary_name_attcode" => ['finalclass', 'complement'],
"complementary_name_attcode" => ['finalclass', 'target_class'],
"state_attcode" => "",
"reconc_keys" => ['description'],
"db_table" => "priv_trigger_onattdelete",
Expand Down
2 changes: 1 addition & 1 deletion datamodels/2.x/itop-attachments/src/Trigger/TriggerOnAttachmentDownload.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public static function Init()
"category" => "grant_by_profile,core/cmdb,application",
"key_type" => "autoincrement",
"name_attcode" => "description",
"complementary_name_attcode" => ['finalclass', 'complement'],
"complementary_name_attcode" => ['finalclass', 'target_class'],
"state_attcode" => "",
"reconc_keys" => ['description'],
"db_table" => "priv_trigger_onattdownload",
Expand Down
2 changes: 1 addition & 1 deletion dictionaries/cs.dictionary.itop.core.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -612,7 +612,7 @@
Dict::Add('CS CZ', 'Czech', 'Čeština', [
'Class:Trigger' => 'Triger',
'Class:Trigger+' => '',
'Class:Trigger/ComplementaryName' => '%1$s, %2$s~~',
'Class:Trigger/ComplementaryName' => '%1$s, class restriction: %2$s~~',
'Class:Trigger/Attribute:description' => 'Popis',
'Class:Trigger/Attribute:description+' => 'Krátký popis',
'Class:Trigger/Attribute:action_list' => 'Spouštěné akce',
Expand Down
2 changes: 1 addition & 1 deletion dictionaries/da.dictionary.itop.core.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,7 +611,7 @@
Dict::Add('DA DA', 'Danish', 'Dansk', [
'Class:Trigger' => 'Triggere',
'Class:Trigger+' => '',
'Class:Trigger/ComplementaryName' => '%1$s, %2$s~~',
'Class:Trigger/ComplementaryName' => '%1$s, class restriction: %2$s~~',
'Class:Trigger/Attribute:description' => 'Beskrivelse',
'Class:Trigger/Attribute:description+' => '',
'Class:Trigger/Attribute:action_list' => 'Triggerede handlinger',
Expand Down
2 changes: 1 addition & 1 deletion dictionaries/de.dictionary.itop.core.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,7 +608,7 @@
Dict::Add('DE DE', 'German', 'Deutsch', [
'Class:Trigger' => 'Trigger',
'Class:Trigger+' => 'Custom event handler',
'Class:Trigger/ComplementaryName' => '%1$s, %2$s',
'Class:Trigger/ComplementaryName' => '%1$s, class restriction: %2$s~~',
'Class:Trigger/Attribute:description' => 'Beschreibung',
'Class:Trigger/Attribute:description+' => 'Kurzbeschreibung',
'Class:Trigger/Attribute:action_list' => 'Verbundene Trigger-Aktionen',
Expand Down
2 changes: 1 addition & 1 deletion dictionaries/en.dictionary.itop.core.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -705,7 +705,7 @@
Dict::Add('EN US', 'English', 'English', [
'Class:Trigger' => 'Trigger',
'Class:Trigger+' => 'Custom event handler',
'Class:Trigger/ComplementaryName' => '%1$s, %2$s',
'Class:Trigger/ComplementaryName' => '%1$s, class restriction: %2$s',
'Class:Trigger/Attribute:description' => 'Description',
'Class:Trigger/Attribute:description+' => 'Be precise as your users will base their potential unsubscription on this information',
'Class:Trigger/Attribute:action_list' => 'Triggered actions',
Expand Down
2 changes: 1 addition & 1 deletion dictionaries/en_gb.dictionary.itop.core.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -688,7 +688,7 @@
Dict::Add('EN GB', 'British English', 'British English', [
'Class:Trigger' => 'Trigger',
'Class:Trigger+' => 'Custom event handler',
'Class:Trigger/ComplementaryName' => '%1$s, %2$s',
'Class:Trigger/ComplementaryName' => '%1$s, class restriction: %2$s~~',
'Class:Trigger/Attribute:description' => 'Description',
'Class:Trigger/Attribute:description+' => 'Be precise as your users will base their potential unsubscribing on this information',
'Class:Trigger/Attribute:action_list' => 'Triggered actions',
Expand Down
2 changes: 1 addition & 1 deletion dictionaries/es_cr.dictionary.itop.core.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -599,7 +599,7 @@
Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
'Class:Trigger' => 'Disparador',
'Class:Trigger+' => 'Disparador',
'Class:Trigger/ComplementaryName' => '%1$s, %2$s',
'Class:Trigger/ComplementaryName' => '%1$s, class restriction: %2$s~~',
'Class:Trigger/Attribute:description' => 'Descripción',
'Class:Trigger/Attribute:description+' => 'Descripción',
'Class:Trigger/Attribute:action_list' => 'Acciones',
Expand Down
2 changes: 1 addition & 1 deletion dictionaries/fr.dictionary.itop.core.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -650,7 +650,7 @@
Dict::Add('FR FR', 'French', 'Français', [
'Class:Trigger' => 'Déclencheur',
'Class:Trigger+' => '',
'Class:Trigger/ComplementaryName' => '%1$s, %2$s',
'Class:Trigger/ComplementaryName' => '%1$s, classe cible : %2$s',
'Class:Trigger/Attribute:description' => 'Description',
'Class:Trigger/Attribute:description+' => 'Soyez explicite, afin que vos utilisateurs comprennent à quelles notifications précisement ils se désabonnent',
'Class:Trigger/Attribute:action_list' => 'Actions déclenchées',
Expand Down
2 changes: 1 addition & 1 deletion dictionaries/hu.dictionary.itop.core.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -606,7 +606,7 @@
Dict::Add('HU HU', 'Hungarian', 'Magyar', [
'Class:Trigger' => 'Eseményindító',
'Class:Trigger+' => 'Egyéni eseménykezelés',
'Class:Trigger/ComplementaryName' => '%1$s, %2$s~~',
'Class:Trigger/ComplementaryName' => '%1$s, class restriction: %2$s~~',
'Class:Trigger/Attribute:description' => 'Leírás',
'Class:Trigger/Attribute:description+' => 'Egysoros leírás',
'Class:Trigger/Attribute:action_list' => 'Elindított műveletek',
Expand Down
2 changes: 1 addition & 1 deletion dictionaries/it.dictionary.itop.core.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -606,7 +606,7 @@
Dict::Add('IT IT', 'Italian', 'Italiano', [
'Class:Trigger' => 'Trigger',
'Class:Trigger+' => 'Gestore di eventi personalizzati',
'Class:Trigger/ComplementaryName' => '%1$s, %2$s',
'Class:Trigger/ComplementaryName' => '%1$s, class restriction: %2$s~~',
'Class:Trigger/Attribute:description' => 'Descrizione',
'Class:Trigger/Attribute:description+' => 'Una linea di descrizione',
'Class:Trigger/Attribute:action_list' => 'Azioni triggerate',
Expand Down
2 changes: 1 addition & 1 deletion dictionaries/ja.dictionary.itop.core.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -610,7 +610,7 @@
Dict::Add('JA JP', 'Japanese', '日本語', [
'Class:Trigger' => 'トリガー',
'Class:Trigger+' => 'カスタムイベントハンドラー',
'Class:Trigger/ComplementaryName' => '%1$s, %2$s~~',
'Class:Trigger/ComplementaryName' => '%1$s, class restriction: %2$s~~',
'Class:Trigger/Attribute:description' => '説明',
'Class:Trigger/Attribute:description+' => '1行の説明',
'Class:Trigger/Attribute:action_list' => 'トリガーされたアクション',
Expand Down
2 changes: 1 addition & 1 deletion dictionaries/nl.dictionary.itop.core.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,7 +608,7 @@
Dict::Add('NL NL', 'Dutch', 'Nederlands', [
'Class:Trigger' => 'Trigger',
'Class:Trigger+' => 'Aanleiding tot het uitvoeren van een actie',
'Class:Trigger/ComplementaryName' => '%1$s, %2$s',
'Class:Trigger/ComplementaryName' => '%1$s, toegepast op klasse: %2$s',
'Class:Trigger/Attribute:description' => 'Beschrijving',
'Class:Trigger/Attribute:description+' => 'Beschrijving in één regel',
'Class:Trigger/Attribute:action_list' => 'Getriggerde acties',
Expand Down
2 changes: 1 addition & 1 deletion dictionaries/pl.dictionary.itop.core.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,7 +608,7 @@
Dict::Add('PL PL', 'Polish', 'Polski', [
'Class:Trigger' => 'Wyzwalacz',
'Class:Trigger+' => 'Niestandardowa obsługa zdarzeń',
'Class:Trigger/ComplementaryName' => '%1$s, %2$s',
'Class:Trigger/ComplementaryName' => '%1$s, class restriction: %2$s~~',
'Class:Trigger/Attribute:description' => 'Opis',
'Class:Trigger/Attribute:description+' => 'jedna linia opisu',
'Class:Trigger/Attribute:action_list' => 'Działania wyzwalacza',
Expand Down
2 changes: 1 addition & 1 deletion dictionaries/pt_br.dictionary.itop.core.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -606,7 +606,7 @@
Dict::Add('PT BR', 'Brazilian', 'Brazilian', [
'Class:Trigger' => 'Gatilho',
'Class:Trigger+' => 'Manipulador de eventos personalizado',
'Class:Trigger/ComplementaryName' => '%1$s, %2$s~~',
'Class:Trigger/ComplementaryName' => '%1$s, class restriction: %2$s~~',
'Class:Trigger/Attribute:description' => 'Descrição',
'Class:Trigger/Attribute:description+' => 'Uma descrição curta',
'Class:Trigger/Attribute:action_list' => 'Ações desencadeadas',
Expand Down
2 changes: 1 addition & 1 deletion dictionaries/ru.dictionary.itop.core.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,7 +611,7 @@
Dict::Add('RU RU', 'Russian', 'Русский', [
'Class:Trigger' => 'Триггер',
'Class:Trigger+' => 'Пользовательский обработчик событий',
'Class:Trigger/ComplementaryName' => '%1$s, %2$s~~',
'Class:Trigger/ComplementaryName' => '%1$s, class restriction: %2$s~~',
'Class:Trigger/Attribute:description' => 'Описание',
'Class:Trigger/Attribute:description+' => 'Описание триггера',
'Class:Trigger/Attribute:action_list' => 'Действия триггера',
Expand Down
2 changes: 1 addition & 1 deletion dictionaries/sk.dictionary.itop.core.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -624,7 +624,7 @@
Dict::Add('SK SK', 'Slovak', 'Slovenčina', [
'Class:Trigger' => 'Spúštač',
'Class:Trigger+' => 'Custom event handler~~',
'Class:Trigger/ComplementaryName' => '%1$s, %2$s~~',
'Class:Trigger/ComplementaryName' => '%1$s, class restriction: %2$s~~',
'Class:Trigger/Attribute:description' => 'Popis',
'Class:Trigger/Attribute:description+' => 'Be precise as your users will base their potential unsubscription on this information~~',
'Class:Trigger/Attribute:action_list' => 'Spúšťané akcie',
Expand Down
2 changes: 1 addition & 1 deletion dictionaries/tr.dictionary.itop.core.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,7 +611,7 @@
Dict::Add('TR TR', 'Turkish', 'Türkçe', [
'Class:Trigger' => 'Tetikleyici',
'Class:Trigger+' => 'Özel olay yürütücü',
'Class:Trigger/ComplementaryName' => '%1$s, %2$s~~',
'Class:Trigger/ComplementaryName' => '%1$s, class restriction: %2$s~~',
'Class:Trigger/Attribute:description' => 'Tanımlama',
'Class:Trigger/Attribute:description+' => 'tek satır tanımlama',
'Class:Trigger/Attribute:action_list' => 'Tetiklenen işlemler',
Expand Down
2 changes: 1 addition & 1 deletion dictionaries/zh_cn.dictionary.itop.core.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -643,7 +643,7 @@
Dict::Add('ZH CN', 'Chinese', '简体中文', [
'Class:Trigger' => '触发器',
'Class:Trigger+' => '自定义事件处理',
'Class:Trigger/ComplementaryName' => '%1$s, %2$s',
'Class:Trigger/ComplementaryName' => '%1$s, class restriction: %2$s~~',
'Class:Trigger/Attribute:description' => '描述',
'Class:Trigger/Attribute:description+' => '简短描述',
'Class:Trigger/Attribute:action_list' => '触发的操作',
Expand Down
3 changes: 2 additions & 1 deletion sources/Service/Base/ObjectRepository.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,8 @@ public static function ComputeOthersData(DBObject $oDbObject, string $sClass, ar
$aData['has_additional_field'] = true;
$aArguments = [];
foreach ($aComplementAttributeSpec[1] as $sAdditionalField) {
$aArguments[] = $oDbObject->Get($sAdditionalField);
//getAsCSV to have user friendly value in text format
$aArguments[] = $oDbObject->GetAsCSV($sAdditionalField,' ','');
}
$aData['additional_field'] = utils::VSprintf($aComplementAttributeSpec[0], $aArguments);
$sAdditionalFieldForHtml = utils::EscapeHtml($aData['additional_field']);
Expand Down