Skip to content

Commit 13c8609

Browse files
v-dumasv-dumas
committed
N°9086 - Add uniqueness rules on OSFamily, OSVersion and IOSVersion
1 parent ac89371 commit 13c8609

18 files changed

+136
-4
lines changed

‎datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4403,6 +4403,17 @@
44034403
<attribute id="osfamily_name"/>
44044404
</attributes>
44054405
</reconciliation>
4406+
<uniqueness_rules>
4407+
<rule id="name_osfamily">
4408+
<attributes>
4409+
<attribute id="name"/>
4410+
<attribute id="osfamily_id"/>
4411+
</attributes>
4412+
<filter><![CDATA[]]></filter>
4413+
<disabled>false</disabled>
4414+
<is_blocking>true</is_blocking>
4415+
</rule>
4416+
</uniqueness_rules>
44064417
</properties>
44074418
<fields>
44084419
<field id="osfamily_id" xsi:type="AttributeExternalKey">
@@ -4469,6 +4480,16 @@
44694480
<attribute id="name"/>
44704481
</attributes>
44714482
</reconciliation>
4483+
<uniqueness_rules>
4484+
<rule id="name">
4485+
<attributes>
4486+
<attribute id="name"/>
4487+
</attributes>
4488+
<filter><![CDATA[]]></filter>
4489+
<disabled>false</disabled>
4490+
<is_blocking>true</is_blocking>
4491+
</rule>
4492+
</uniqueness_rules>
44724493
</properties>
44734494
<fields/>
44744495
<methods/>
@@ -4862,6 +4883,15 @@
48624883
<attribute id="brand_name"/>
48634884
</attributes>
48644885
</reconciliation>
4886+
<uniqueness_rules>
4887+
<rule id="name_brand">
4888+
<attributes>
4889+
<attribute id="name"/>
4890+
<attribute id="brand_id"/>
4891+
</attributes>
4892+
<is_blocking>true</is_blocking>
4893+
</rule>
4894+
</uniqueness_rules>
48654895
</properties>
48664896
<fields>
48674897
<field id="brand_id" xsi:type="AttributeExternalKey">

‎datamodels/2.x/itop-config-mgmt/dictionaries/cs.dict.itop-config-mgmt.php‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1055,6 +1055,8 @@
10551055
'Class:OSVersion/Attribute:osfamily_id+' => '',
10561056
'Class:OSVersion/Attribute:osfamily_name' => 'Název rodiny OS',
10571057
'Class:OSVersion/Attribute:osfamily_name+' => '',
1058+
'Class:OSVersion/UniquenessRule:name_osfamily+' => 'Name must be unique in the OS family~~',
1059+
'Class:OSVersion/UniquenessRule:name_osfamily' => 'this OS version already exists within the OS family~~',
10581060
]);
10591061

10601062
//
@@ -1064,6 +1066,8 @@
10641066
Dict::Add('CS CZ', 'Czech', 'Čeština', [
10651067
'Class:OSFamily' => 'Rodina OS',
10661068
'Class:OSFamily+' => '',
1069+
'Class:OSFamily/UniquenessRule:name+' => 'Name must be unique~~',
1070+
'Class:OSFamily/UniquenessRule:name' => 'this OS family already exists~~',
10671071
]);
10681072

10691073
//
@@ -1161,6 +1165,8 @@
11611165
'Class:IOSVersion/Attribute:brand_id+' => '',
11621166
'Class:IOSVersion/Attribute:brand_name' => 'Název výrobce',
11631167
'Class:IOSVersion/Attribute:brand_name+' => '',
1168+
'Class:IOSVersion/UniquenessRule:name_brand+' => 'Name must be unique in the brand~~',
1169+
'Class:IOSVersion/UniquenessRule:name_brand' => 'this IOS version already exists for this brand~~',
11641170
]);
11651171

11661172
//

‎datamodels/2.x/itop-config-mgmt/dictionaries/da.dict.itop-config-mgmt.php‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1054,6 +1054,8 @@
10541054
'Class:OSVersion/Attribute:osfamily_id+' => '',
10551055
'Class:OSVersion/Attribute:osfamily_name' => 'OS familienavn',
10561056
'Class:OSVersion/Attribute:osfamily_name+' => '',
1057+
'Class:OSVersion/UniquenessRule:name_osfamily+' => 'Name must be unique in the OS family~~',
1058+
'Class:OSVersion/UniquenessRule:name_osfamily' => 'this OS version already exists within the OS family~~',
10571059
]);
10581060

10591061
//
@@ -1063,6 +1065,8 @@
10631065
Dict::Add('DA DA', 'Danish', 'Dansk', [
10641066
'Class:OSFamily' => 'OS-Familie',
10651067
'Class:OSFamily+' => '',
1068+
'Class:OSFamily/UniquenessRule:name+' => 'Name must be unique~~',
1069+
'Class:OSFamily/UniquenessRule:name' => 'this OS family already exists~~',
10661070
]);
10671071

10681072
//
@@ -1160,6 +1164,8 @@
11601164
'Class:IOSVersion/Attribute:brand_id+' => '',
11611165
'Class:IOSVersion/Attribute:brand_name' => 'Mærkenavn',
11621166
'Class:IOSVersion/Attribute:brand_name+' => '',
1167+
'Class:IOSVersion/UniquenessRule:name_brand+' => 'Name must be unique in the brand~~',
1168+
'Class:IOSVersion/UniquenessRule:name_brand' => 'this IOS version already exists for this brand~~',
11631169
]);
11641170

11651171
//

‎datamodels/2.x/itop-config-mgmt/dictionaries/de.dict.itop-config-mgmt.php‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1054,6 +1054,8 @@
10541054
'Class:OSVersion/Attribute:osfamily_id+' => '',
10551055
'Class:OSVersion/Attribute:osfamily_name' => 'OS-Familienname',
10561056
'Class:OSVersion/Attribute:osfamily_name+' => '',
1057+
'Class:OSVersion/UniquenessRule:name_osfamily+' => 'Name must be unique in the OS family~~',
1058+
'Class:OSVersion/UniquenessRule:name_osfamily' => 'this OS version already exists within the OS family~~',
10571059
]);
10581060

10591061
//
@@ -1063,6 +1065,8 @@
10631065
Dict::Add('DE DE', 'German', 'Deutsch', [
10641066
'Class:OSFamily' => 'OS-Familie',
10651067
'Class:OSFamily+' => '',
1068+
'Class:OSFamily/UniquenessRule:name+' => 'Name must be unique~~',
1069+
'Class:OSFamily/UniquenessRule:name' => 'this OS family already exists~~',
10661070
]);
10671071

10681072
//
@@ -1160,6 +1164,8 @@
11601164
'Class:IOSVersion/Attribute:brand_id+' => '',
11611165
'Class:IOSVersion/Attribute:brand_name' => 'Markenname',
11621166
'Class:IOSVersion/Attribute:brand_name+' => '',
1167+
'Class:IOSVersion/UniquenessRule:name_brand+' => 'Name must be unique in the brand~~',
1168+
'Class:IOSVersion/UniquenessRule:name_brand' => 'this IOS version already exists for this brand~~',
11631169
]);
11641170

11651171
//

‎datamodels/2.x/itop-config-mgmt/dictionaries/en.dict.itop-config-mgmt.php‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1073,6 +1073,8 @@
10731073
'Class:OSVersion/Attribute:osfamily_id+' => '',
10741074
'Class:OSVersion/Attribute:osfamily_name' => 'OS family name',
10751075
'Class:OSVersion/Attribute:osfamily_name+' => '',
1076+
'Class:OSVersion/UniquenessRule:name_osfamily+' => 'Name must be unique in the OS family',
1077+
'Class:OSVersion/UniquenessRule:name_osfamily' => 'this OS version already exists within the OS family',
10761078
]);
10771079

10781080
//
@@ -1082,6 +1084,8 @@
10821084
Dict::Add('EN US', 'English', 'English', [
10831085
'Class:OSFamily' => 'OS Family',
10841086
'Class:OSFamily+' => '',
1087+
'Class:OSFamily/UniquenessRule:name+' => 'Name must be unique',
1088+
'Class:OSFamily/UniquenessRule:name' => 'this OS family already exists',
10851089
]);
10861090

10871091
//
@@ -1179,6 +1183,8 @@
11791183
'Class:IOSVersion/Attribute:brand_id+' => '',
11801184
'Class:IOSVersion/Attribute:brand_name' => 'Brand name',
11811185
'Class:IOSVersion/Attribute:brand_name+' => '',
1186+
'Class:IOSVersion/UniquenessRule:name_brand+' => 'Name must be unique in the brand',
1187+
'Class:IOSVersion/UniquenessRule:name_brand' => 'this IOS version already exists for this brand',
11821188
]);
11831189

11841190
//

‎datamodels/2.x/itop-config-mgmt/dictionaries/en_gb.dict.itop-config-mgmt.php‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1073,6 +1073,8 @@
10731073
'Class:OSVersion/Attribute:osfamily_id+' => '',
10741074
'Class:OSVersion/Attribute:osfamily_name' => 'OS family name',
10751075
'Class:OSVersion/Attribute:osfamily_name+' => '',
1076+
'Class:OSVersion/UniquenessRule:name_osfamily+' => 'Name must be unique in the OS family~~',
1077+
'Class:OSVersion/UniquenessRule:name_osfamily' => 'this OS version already exists within the OS family~~',
10761078
]);
10771079

10781080
//
@@ -1082,6 +1084,8 @@
10821084
Dict::Add('EN GB', 'British English', 'British English', [
10831085
'Class:OSFamily' => 'OS Family',
10841086
'Class:OSFamily+' => '',
1087+
'Class:OSFamily/UniquenessRule:name+' => 'Name must be unique~~',
1088+
'Class:OSFamily/UniquenessRule:name' => 'this OS family already exists~~',
10851089
]);
10861090

10871091
//
@@ -1179,6 +1183,8 @@
11791183
'Class:IOSVersion/Attribute:brand_id+' => '',
11801184
'Class:IOSVersion/Attribute:brand_name' => 'Brand name',
11811185
'Class:IOSVersion/Attribute:brand_name+' => '',
1186+
'Class:IOSVersion/UniquenessRule:name_brand+' => 'Name must be unique in the brand~~',
1187+
'Class:IOSVersion/UniquenessRule:name_brand' => 'this IOS version already exists for this brand~~',
11821188
]);
11831189

11841190
//

‎datamodels/2.x/itop-config-mgmt/dictionaries/es_cr.dict.itop-config-mgmt.php‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1051,6 +1051,8 @@
10511051
'Class:OSVersion/Attribute:osfamily_id+' => 'Familia de SO',
10521052
'Class:OSVersion/Attribute:osfamily_name' => 'Familia de SO',
10531053
'Class:OSVersion/Attribute:osfamily_name+' => 'Familia de SO',
1054+
'Class:OSVersion/UniquenessRule:name_osfamily+' => 'Name must be unique in the OS family~~',
1055+
'Class:OSVersion/UniquenessRule:name_osfamily' => 'this OS version already exists within the OS family~~',
10541056
]);
10551057

10561058
//
@@ -1060,6 +1062,8 @@
10601062
Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
10611063
'Class:OSFamily' => 'Familia de SO',
10621064
'Class:OSFamily+' => 'Familia de SO',
1065+
'Class:OSFamily/UniquenessRule:name+' => 'Name must be unique~~',
1066+
'Class:OSFamily/UniquenessRule:name' => 'this OS family already exists~~',
10631067
]);
10641068

10651069
//
@@ -1157,6 +1161,8 @@
11571161
'Class:IOSVersion/Attribute:brand_id+' => 'Marca',
11581162
'Class:IOSVersion/Attribute:brand_name' => 'Marca',
11591163
'Class:IOSVersion/Attribute:brand_name+' => 'Marca',
1164+
'Class:IOSVersion/UniquenessRule:name_brand+' => 'Name must be unique in the brand~~',
1165+
'Class:IOSVersion/UniquenessRule:name_brand' => 'this IOS version already exists for this brand~~',
11601166
]);
11611167

11621168
//

‎datamodels/2.x/itop-config-mgmt/dictionaries/fr.dict.itop-config-mgmt.php‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1203,6 +1203,8 @@
12031203
'Class:OSVersion/Attribute:osfamily_id+' => '',
12041204
'Class:OSVersion/Attribute:osfamily_name' => 'Nom Famille OS',
12051205
'Class:OSVersion/Attribute:osfamily_name+' => '',
1206+
'Class:OSVersion/UniquenessRule:name_osfamily+' => 'Le nom doit être unique au sein de cette famille d\'OS',
1207+
'Class:OSVersion/UniquenessRule:name_osfamily' => 'cette version d\'OS existe déjà dans cette famille',
12061208
]);
12071209

12081210
//
@@ -1212,6 +1214,8 @@
12121214
Dict::Add('FR FR', 'French', 'Français', [
12131215
'Class:OSFamily' => 'Famille OS',
12141216
'Class:OSFamily+' => '',
1217+
'Class:OSFamily/UniquenessRule:name+' => 'Le nom doit être unique',
1218+
'Class:OSFamily/UniquenessRule:name' => 'cette famille d\'OS existe déjà',
12151219
]);
12161220

12171221
//
@@ -1327,6 +1331,8 @@
13271331
'Class:IOSVersion/Attribute:brand_id+' => '',
13281332
'Class:IOSVersion/Attribute:brand_name' => 'Nom Marque',
13291333
'Class:IOSVersion/Attribute:brand_name+' => '',
1334+
'Class:IOSVersion/UniquenessRule:name_brand+' => 'Le nom doit être unique pour cette marque',
1335+
'Class:IOSVersion/UniquenessRule:name_brand' => 'cette version d\'IOS existe déja sur cette marque',
13301336
]);
13311337

13321338
//

‎datamodels/2.x/itop-config-mgmt/dictionaries/hu.dict.itop-config-mgmt.php‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1052,7 +1052,9 @@
10521052
'Class:OSVersion/Attribute:osfamily_id' => 'OS család',
10531053
'Class:OSVersion/Attribute:osfamily_id+' => '~~',
10541054
'Class:OSVersion/Attribute:osfamily_name' => 'OS család név',
1055-
'Class:OSVersion/Attribute:osfamily_name+' => '~~',
1055+
'Class:OSVersion/Attribute:osfamily_name+' => '',
1056+
'Class:OSVersion/UniquenessRule:name_osfamily+' => 'Name must be unique in the OS family~~',
1057+
'Class:OSVersion/UniquenessRule:name_osfamily' => 'this OS version already exists within the OS family~~',
10561058
]);
10571059

10581060
//
@@ -1061,7 +1063,9 @@
10611063

10621064
Dict::Add('HU HU', 'Hungarian', 'Magyar', [
10631065
'Class:OSFamily' => 'OS család',
1064-
'Class:OSFamily+' => '~~',
1066+
'Class:OSFamily+' => '',
1067+
'Class:OSFamily/UniquenessRule:name+' => 'Name must be unique~~',
1068+
'Class:OSFamily/UniquenessRule:name' => 'this OS family already exists~~',
10651069
]);
10661070

10671071
//
@@ -1159,6 +1163,8 @@
11591163
'Class:IOSVersion/Attribute:brand_id+' => '~~',
11601164
'Class:IOSVersion/Attribute:brand_name' => 'Gyártó név',
11611165
'Class:IOSVersion/Attribute:brand_name+' => '~~',
1166+
'Class:IOSVersion/UniquenessRule:name_brand+' => 'Name must be unique in the brand~~',
1167+
'Class:IOSVersion/UniquenessRule:name_brand' => 'this IOS version already exists for this brand~~',
11621168
]);
11631169

11641170
//

‎datamodels/2.x/itop-config-mgmt/dictionaries/it.dict.itop-config-mgmt.php‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1052,7 +1052,9 @@
10521052
'Class:OSVersion/Attribute:osfamily_id' => 'Famiglia del Sistema Operativo',
10531053
'Class:OSVersion/Attribute:osfamily_id+' => '~~',
10541054
'Class:OSVersion/Attribute:osfamily_name' => 'Nome della Famiglia del Sistema Operativo',
1055-
'Class:OSVersion/Attribute:osfamily_name+' => '~~',
1055+
'Class:OSVersion/Attribute:osfamily_name+' => '',
1056+
'Class:OSVersion/UniquenessRule:name_osfamily+' => 'Name must be unique in the OS family~~',
1057+
'Class:OSVersion/UniquenessRule:name_osfamily' => 'this OS version already exists within the OS family~~',
10561058
]);
10571059

10581060
//
@@ -1061,7 +1063,9 @@
10611063

10621064
Dict::Add('IT IT', 'Italian', 'Italiano', [
10631065
'Class:OSFamily' => 'Famiglia del Sistema Operativo',
1064-
'Class:OSFamily+' => '~~',
1066+
'Class:OSFamily+' => '',
1067+
'Class:OSFamily/UniquenessRule:name+' => 'Name must be unique~~',
1068+
'Class:OSFamily/UniquenessRule:name' => 'this OS family already exists~~',
10651069
]);
10661070

10671071
//
@@ -1180,6 +1184,8 @@
11801184
'Class:IOSVersion/Attribute:brand_id+' => '~~',
11811185
'Class:IOSVersion/Attribute:brand_name' => 'Nome della marca',
11821186
'Class:IOSVersion/Attribute:brand_name+' => '~~',
1187+
'Class:IOSVersion/UniquenessRule:name_brand+' => 'Name must be unique in the brand~~',
1188+
'Class:IOSVersion/UniquenessRule:name_brand' => 'this IOS version already exists for this brand~~',
11831189
]);
11841190

11851191
//

0 commit comments

Comments
 (0)