From bd04b2a24c248d14f81a06eecce8c012a49847a9 Mon Sep 17 00:00:00 2001 From: vdumas Date: Sat, 20 May 2023 17:20:16 +0200 Subject: [PATCH] =?UTF-8?q?N=C2=B06203=20-=20Standard=20DM=20overcard,=20c?= =?UTF-8?q?omplementary=20name?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datamodel.itop-service-mgmt-provider.xml | 31 +++++++++++++++++++ .../en.dict.itop-service-mgmt-provider.php | 2 ++ .../datamodel.itop-service-mgmt.xml | 31 +++++++++++++++++++ .../en.dict.itop-service-mgmt.php | 2 ++ .../datamodel.itop-structure.xml | 9 ++++++ .../dictionaries/en.dict.itop-structure.php | 2 ++ 6 files changed, 77 insertions(+) diff --git a/datamodels/2.x/itop-service-mgmt-provider/datamodel.itop-service-mgmt-provider.xml b/datamodels/2.x/itop-service-mgmt-provider/datamodel.itop-service-mgmt-provider.xml index e800a1b6cc..d133337cff 100755 --- a/datamodels/2.x/itop-service-mgmt-provider/datamodel.itop-service-mgmt-provider.xml +++ b/datamodels/2.x/itop-service-mgmt-provider/datamodel.itop-service-mgmt-provider.xml @@ -1043,6 +1043,10 @@ public function PrefillSearchForm(&$aContextParam) + + + + icon @@ -1234,6 +1238,16 @@ public function PrefillSearchForm(&$aContextParam) + + + + 10 + + + 20 + + + @@ -1435,6 +1449,10 @@ public function PrefillSearchForm(&$aContextParam) + + + + status @@ -1587,6 +1605,19 @@ public function PrefillSearchForm(&$aContextParam) + + + + 10 + + + 20 + + + 30 + + + diff --git a/datamodels/2.x/itop-service-mgmt-provider/dictionaries/en.dict.itop-service-mgmt-provider.php b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/en.dict.itop-service-mgmt-provider.php index 14194bed89..0e284e3c06 100644 --- a/datamodels/2.x/itop-service-mgmt-provider/dictionaries/en.dict.itop-service-mgmt-provider.php +++ b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/en.dict.itop-service-mgmt-provider.php @@ -255,6 +255,7 @@ Dict::Add('EN US', 'English', 'English', array( Dict::Add('EN US', 'English', 'English', array( 'Class:Service' => 'Service', 'Class:Service+' => '', + 'Class:Service/ComplementaryName' => '%1$s - %2$s', 'Class:Service/Attribute:name' => 'Name', 'Class:Service/Attribute:name+' => '', 'Class:Service/Attribute:org_id' => 'Provider', @@ -330,6 +331,7 @@ Dict::Add('EN US', 'English', 'English', array( Dict::Add('EN US', 'English', 'English', array( 'Class:ServiceSubcategory' => 'Service Subcategory', 'Class:ServiceSubcategory+' => '', + 'Class:ServiceSubcategory/ComplementaryName' => '%1$s - %2$s', 'Class:ServiceSubcategory/Attribute:name' => 'Name', 'Class:ServiceSubcategory/Attribute:name+' => '', 'Class:ServiceSubcategory/Attribute:description' => 'Description', diff --git a/datamodels/2.x/itop-service-mgmt/datamodel.itop-service-mgmt.xml b/datamodels/2.x/itop-service-mgmt/datamodel.itop-service-mgmt.xml index ff9dc4d54e..8a24fd4438 100755 --- a/datamodels/2.x/itop-service-mgmt/datamodel.itop-service-mgmt.xml +++ b/datamodels/2.x/itop-service-mgmt/datamodel.itop-service-mgmt.xml @@ -1013,6 +1013,10 @@ public function PrefillSearchForm(&$aContextParam) + + + + icon @@ -1228,6 +1232,16 @@ public function PrefillSearchForm(&$aContextParam) + + + + 10 + + + 20 + + + @@ -1429,6 +1443,10 @@ public function PrefillSearchForm(&$aContextParam) + + + + status @@ -1581,6 +1599,19 @@ public function PrefillSearchForm(&$aContextParam) + + + + 10 + + + 20 + + + 30 + + + diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/en.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/en.dict.itop-service-mgmt.php index 10c4e69426..e4498d4262 100644 --- a/datamodels/2.x/itop-service-mgmt/dictionaries/en.dict.itop-service-mgmt.php +++ b/datamodels/2.x/itop-service-mgmt/dictionaries/en.dict.itop-service-mgmt.php @@ -224,6 +224,7 @@ Dict::Add('EN US', 'English', 'English', array( Dict::Add('EN US', 'English', 'English', array( 'Class:Service' => 'Service', 'Class:Service+' => '', + 'Class:Service/ComplementaryName' => '%1$s - %2$s', 'Class:Service/Attribute:name' => 'Name', 'Class:Service/Attribute:name+' => '', 'Class:Service/Attribute:org_id' => 'Provider', @@ -303,6 +304,7 @@ Dict::Add('EN US', 'English', 'English', array( Dict::Add('EN US', 'English', 'English', array( 'Class:ServiceSubcategory' => 'Service Subcategory', 'Class:ServiceSubcategory+' => '', + 'Class:ServiceSubcategory/ComplementaryName' => '%1$s - %2$s', 'Class:ServiceSubcategory/Attribute:name' => 'Name', 'Class:ServiceSubcategory/Attribute:name+' => '', 'Class:ServiceSubcategory/Attribute:description' => 'Description', diff --git a/datamodels/2.x/itop-structure/datamodel.itop-structure.xml b/datamodels/2.x/itop-structure/datamodel.itop-structure.xml index 2c58d5507b..d8f4e40ebe 100644 --- a/datamodels/2.x/itop-structure/datamodel.itop-structure.xml +++ b/datamodels/2.x/itop-structure/datamodel.itop-structure.xml @@ -407,6 +407,10 @@ + + + + status @@ -1302,6 +1306,11 @@ finalclass + + + + + status diff --git a/datamodels/2.x/itop-structure/dictionaries/en.dict.itop-structure.php b/datamodels/2.x/itop-structure/dictionaries/en.dict.itop-structure.php index 6b02dc98f1..b851150861 100644 --- a/datamodels/2.x/itop-structure/dictionaries/en.dict.itop-structure.php +++ b/datamodels/2.x/itop-structure/dictionaries/en.dict.itop-structure.php @@ -119,6 +119,7 @@ Dict::Add('EN US', 'English', 'English', array( Dict::Add('EN US', 'English', 'English', array( 'Class:Contact' => 'Contact', 'Class:Contact+' => '', + 'Class:Contact/ComplementaryName' => '%1$s - %2$s', 'Class:Contact/Attribute:name' => 'Name', 'Class:Contact/Attribute:name+' => '', 'Class:Contact/Attribute:status' => 'Status', @@ -211,6 +212,7 @@ Dict::Add('EN US', 'English', 'English', array( Dict::Add('EN US', 'English', 'English', array( 'Class:Document' => 'Document', 'Class:Document+' => '', + 'Class:Document/ComplementaryName' => '%1$s - %2$s - %3$s', 'Class:Document/Attribute:name' => 'Name', 'Class:Document/Attribute:name+' => '', 'Class:Document/Attribute:org_id' => 'Organization',