From 6b8d9ea08d47cd6797b7553986db8c9f9bb328b0 Mon Sep 17 00:00:00 2001
From: vdumas <vincent.dumas@combodo.com>
Date: Thu, 26 Jan 2023 09:03:52 +0100
Subject: [PATCH] =?UTF-8?q?N=C2=B05915=20-=20Complementary=20Name=20on=20T?=
 =?UTF-8?q?rigger=20and=20Action?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/action.class.inc.php                | 19 +++++++++---------
 core/trigger.class.inc.php               | 19 +++++++++---------
 dictionaries/en.dictionary.itop.core.php | 25 ++++++++++++------------
 3 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/core/action.class.inc.php b/core/action.class.inc.php
index 359bd6093..fb66d8882 100644
--- a/core/action.class.inc.php
+++ b/core/action.class.inc.php
@@ -43,15 +43,16 @@ abstract class Action extends cmdbAbstractObject
 	{
 		$aParams = array
 		(
-			"category" => "grant_by_profile,core/cmdb",
-			"key_type" => "autoincrement",
-			"name_attcode" => "name",
-			"state_attcode" => "",
-			"reconc_keys" => array('name'),
-			"db_table" => "priv_action",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "realclass",
-			'style' =>  new ormStyle(null, null, null, null, null, '../images/icons/icons8-in-transit.svg'),
+			"category"                   => "grant_by_profile,core/cmdb",
+			"key_type"                   => "autoincrement",
+			"name_attcode"               => "name",
+			"complementary_name_attcode" => array('finalclass', 'description'),
+			"state_attcode"              => "",
+			"reconc_keys"                => array('name'),
+			"db_table"                   => "priv_action",
+			"db_key_field"               => "id",
+			"db_finalclass_field"        => "realclass",
+			'style'                      => new ormStyle(null, null, null, null, null, '../images/icons/icons8-in-transit.svg'),
 		);
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
diff --git a/core/trigger.class.inc.php b/core/trigger.class.inc.php
index 4cf4b6e2f..cdbb51f78 100644
--- a/core/trigger.class.inc.php
+++ b/core/trigger.class.inc.php
@@ -33,15 +33,16 @@ abstract class Trigger extends cmdbAbstractObject
 	{
 		$aParams = array
 		(
-			"category" => "grant_by_profile,core/cmdb",
-			"key_type" => "autoincrement",
-			"name_attcode" => "description",
-			"state_attcode" => "",
-			"reconc_keys" => array('description'),
-			"db_table" => "priv_trigger",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "realclass",
-			'style' =>  new ormStyle(null, null, null, null, null, '../images/icons/icons8-conflict.svg'),
+			"category"                   => "grant_by_profile,core/cmdb",
+			"key_type"                   => "autoincrement",
+			"name_attcode"               => "description",
+			"complementary_name_attcode" => array('finalclass'),
+			"state_attcode"              => "",
+			"reconc_keys"                => array('description'),
+			"db_table"                   => "priv_trigger",
+			"db_key_field"               => "id",
+			"db_finalclass_field"        => "realclass",
+			'style'                      => new ormStyle(null, null, null, null, null, '../images/icons/icons8-conflict.svg'),
 		);
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
diff --git a/dictionaries/en.dictionary.itop.core.php b/dictionaries/en.dictionary.itop.core.php
index 4920f22cd..646ac65d1 100644
--- a/dictionaries/en.dictionary.itop.core.php
+++ b/dictionaries/en.dictionary.itop.core.php
@@ -483,18 +483,19 @@ Dict::Add('EN US', 'English', 'English', array(
 //
 
 Dict::Add('EN US', 'English', 'English', array(
-	'Class:Action' => 'Custom Action',
-	'Class:Action+' => 'User defined action',
-	'Class:Action/Attribute:name' => 'Name',
-	'Class:Action/Attribute:name+' => '',
-	'Class:Action/Attribute:description' => 'Description',
-	'Class:Action/Attribute:description+' => '',
-	'Class:Action/Attribute:status' => 'Status',
-	'Class:Action/Attribute:status+' => 'This status drives the action behavior',
-	'Class:Action/Attribute:status/Value:test' => 'Being tested',
-	'Class:Action/Attribute:status/Value:test+' => '',
-	'Class:Action/Attribute:status/Value:enabled' => 'In production',
-	'Class:Action/Attribute:status/Value:enabled+' => '',
+	'Class:Action'                                  => 'Custom Action',
+	'Class:Action+'                                 => 'User defined action',
+	'Class:Action/ComplementaryName'                => '%1$s: %2$s',
+	'Class:Action/Attribute:name'                   => 'Name',
+	'Class:Action/Attribute:name+'                  => '',
+	'Class:Action/Attribute:description'            => 'Description',
+	'Class:Action/Attribute:description+'           => '',
+	'Class:Action/Attribute:status'                 => 'Status',
+	'Class:Action/Attribute:status+'                => 'This status drives the action behavior',
+	'Class:Action/Attribute:status/Value:test'      => 'Being tested',
+	'Class:Action/Attribute:status/Value:test+'     => '',
+	'Class:Action/Attribute:status/Value:enabled'   => 'In production',
+	'Class:Action/Attribute:status/Value:enabled+'  => '',
 	'Class:Action/Attribute:status/Value:disabled' => 'Inactive',
 	'Class:Action/Attribute:status/Value:disabled+' => '',
 	'Class:Action/Attribute:trigger_list' => 'Related Triggers',