Skip to content

Commit fa8ecb9

Browse files
v-dumasv-dumas
authored
N°8776, N°8623, N°8496, N°8445, N°8378, N°8040 & N°7755 (#769)
* N°8776 - Move Attachemnt above caselog in the UR form in the portal * N°8623 - French dictionaries, fix missing entries * N°8496 - Add tooltips on Known Error class * N°8445 - Color "Priority" on Userrequest & Incident in ITIL * N°8378 - Missing rights on incident for SuperUser * N°8040 - FR dico replacing left "Statut" by "Etat" * N°7755 - Add tto_time_spent and ttr_time_spent on standard datamodel
1 parent 58eae4d commit fa8ecb9

File tree

86 files changed

+622
-351
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+622
-351
lines changed

‎datamodels/2.x/authent-ldap/dictionaries/fr.dict.authent-ldap.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
//
2222

2323
Dict::Add('FR FR', 'French', 'Français', [
24-
'Class:UserLDAP/Attribute:ldap_server' => 'Ldap server~~',
25-
'Class:UserLDAP/Attribute:ldap_server+' => '~~',
24+
'Class:UserLDAP/Attribute:ldap_server' => 'Serveur LDAP',
25+
'Class:UserLDAP/Attribute:ldap_server+' => 'Serveur LDAP utilisé pour l\'authentification de cet utilisateur',
2626
]);

‎datamodels/2.x/authent-local/dictionaries/fr.dict.authent-local.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
'Class:UserLocal/Attribute:password' => 'Mot de passe',
1717
'Class:UserLocal/Attribute:password+' => '',
1818
'Class:UserLocal/Attribute:expiration' => 'Validité du mot de passe',
19-
'Class:UserLocal/Attribute:expiration+' => 'Statut du mot de passe (nécessite une extension pour avoir un effet)',
19+
'Class:UserLocal/Attribute:expiration+' => 'État du mot de passe (nécessite une extension pour avoir un effet)',
2020
'Class:UserLocal/Attribute:expiration/Value:can_expire' => 'Durée limitée',
2121
'Class:UserLocal/Attribute:expiration/Value:can_expire+' => '',
2222
'Class:UserLocal/Attribute:expiration/Value:never_expire' => 'Permanente',

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
'UI-ChangeManagementOverview-ChangeByCategory-last-7-days' => 'Changements par catégorie',
3232
'UI-ChangeManagementOverview-Last-7-days' => 'Changements par jour',
3333
'UI-ChangeManagementOverview-ChangeByDomain-last-7-days' => 'Changements par domaine',
34-
'UI-ChangeManagementOverview-ChangeByStatus-last-7-days' => 'Changements par statut',
34+
'UI-ChangeManagementOverview-ChangeByStatus-last-7-days' => 'Changements par état',
3535
'Tickets:Related:OpenChanges' => 'Changements en cours',
3636
'Tickets:Related:RecentChanges' => 'Changements récents (72h)',
3737
]);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
'UI-ChangeManagementOverview-ChangeByCategory-last-7-days' => 'Changements par catégorie',
3232
'UI-ChangeManagementOverview-Last-7-days' => 'Changements par jour',
3333
'UI-ChangeManagementOverview-ChangeByDomain-last-7-days' => 'Changements par domaine',
34-
'UI-ChangeManagementOverview-ChangeByStatus-last-7-days' => 'Changements par statut',
34+
'UI-ChangeManagementOverview-ChangeByStatus-last-7-days' => 'Changements par état',
3535
'Tickets:Related:OpenChanges' => 'Changements en cours',
3636
'Tickets:Related:RecentChanges' => 'Changements récents (72h)',
3737
]);

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1786,8 +1786,8 @@
17861786
//
17871787

17881788
Dict::Add('FR FR', 'French', 'Français', [
1789-
'Class:PhysicalInterface/Attribute:org_id' => 'Org id~~',
1790-
'Class:PhysicalInterface/Attribute:org_id+' => '~~',
1791-
'Class:PhysicalInterface/Attribute:location_id' => 'Location id~~',
1792-
'Class:PhysicalInterface/Attribute:location_id+' => '~~',
1789+
'Class:PhysicalInterface/Attribute:org_id' => 'Organisation',
1790+
'Class:PhysicalInterface/Attribute:org_id+' => '',
1791+
'Class:PhysicalInterface/Attribute:location_id' => 'Site',
1792+
'Class:PhysicalInterface/Attribute:location_id+' => '',
17931793
]);

‎datamodels/2.x/itop-incident-mgmt-itil/datamodel.itop-incident-mgmt-itil.xml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,15 +142,35 @@
142142
<values>
143143
<value id="1">
144144
<code>1</code>
145+
<style>
146+
<main_color>$ibo-color-danger-700</main_color>
147+
<complementary_color>$ibo-color-white-100</complementary_color>
148+
<decoration_classes>fas fa-fire</decoration_classes>
149+
</style>
145150
</value>
146151
<value id="2">
147152
<code>2</code>
153+
<style>
154+
<main_color>$ibo-color-warning-700</main_color>
155+
<complementary_color>$ibo-color-white-100</complementary_color>
156+
<decoration_classes/>
157+
</style>
148158
</value>
149159
<value id="3">
150160
<code>3</code>
161+
<style>
162+
<main_color>$ibo-color-information-700</main_color>
163+
<complementary_color>$ibo-color-white-100</complementary_color>
164+
<decoration_classes/>
165+
</style>
151166
</value>
152167
<value id="4">
153168
<code>4</code>
169+
<style>
170+
<main_color>$ibo-color-grey-700</main_color>
171+
<complementary_color>$ibo-color-white-100</complementary_color>
172+
<decoration_classes/>
173+
</style>
154174
</value>
155175
</values>
156176
<dependencies>
@@ -363,6 +383,10 @@
363383
<target_attcode>tto</target_attcode>
364384
<item_code>100_overrun</item_code>
365385
</field>
386+
<field id="tto_time_spent" xsi:type="AttributeSubItem">
387+
<target_attcode>tto</target_attcode>
388+
<item_code>timespent</item_code>
389+
</field>
366390
<field id="ttr_escalation_deadline" xsi:type="AttributeSubItem">
367391
<target_attcode>ttr</target_attcode>
368392
<item_code>100_deadline</item_code>
@@ -375,6 +399,10 @@
375399
<target_attcode>ttr</target_attcode>
376400
<item_code>100_overrun</item_code>
377401
</field>
402+
<field id="ttr_time_spent" xsi:type="AttributeSubItem">
403+
<target_attcode>ttr</target_attcode>
404+
<item_code>timespent</item_code>
405+
</field>
378406
<field id="time_spent" xsi:type="AttributeDuration">
379407
<sql>time_spent</sql>
380408
<default_value/>

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,10 @@
141141
'Class:Incident/Attribute:tto+' => '',
142142
'Class:Incident/Attribute:ttr' => 'ttr',
143143
'Class:Incident/Attribute:ttr+' => '',
144+
'Class:Incident/Attribute:tto_time_spent' => 'TTO time spent~~',
145+
'Class:Incident/Attribute:tto_time_spent+' => '~~',
146+
'Class:Incident/Attribute:ttr_time_spent' => 'TTR time spent~~',
147+
'Class:Incident/Attribute:ttr_time_spent+' => '~~',
144148
'Class:Incident/Attribute:tto_escalation_deadline' => 'Požadovaný čas přidělení',
145149
'Class:Incident/Attribute:tto_escalation_deadline+' => '',
146150
'Class:Incident/Attribute:sla_tto_passed' => 'TTO vypršel',

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,10 @@
140140
'Class:Incident/Attribute:tto+' => '',
141141
'Class:Incident/Attribute:ttr' => 'TTR (Time To Resolve)',
142142
'Class:Incident/Attribute:ttr+' => '',
143+
'Class:Incident/Attribute:tto_time_spent' => 'TTO time spent~~',
144+
'Class:Incident/Attribute:tto_time_spent+' => '~~',
145+
'Class:Incident/Attribute:ttr_time_spent' => 'TTR time spent~~',
146+
'Class:Incident/Attribute:ttr_time_spent+' => '~~',
143147
'Class:Incident/Attribute:tto_escalation_deadline' => 'TTO-Deadline',
144148
'Class:Incident/Attribute:tto_escalation_deadline+' => '',
145149
'Class:Incident/Attribute:sla_tto_passed' => 'SLA TTO overskredet',

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,10 @@
140140
'Class:Incident/Attribute:tto+' => '',
141141
'Class:Incident/Attribute:ttr' => 'TTR (Time To Resolve)',
142142
'Class:Incident/Attribute:ttr+' => '',
143+
'Class:Incident/Attribute:tto_time_spent' => 'TTO time spent~~',
144+
'Class:Incident/Attribute:tto_time_spent+' => '~~',
145+
'Class:Incident/Attribute:ttr_time_spent' => 'TTR time spent~~',
146+
'Class:Incident/Attribute:ttr_time_spent+' => '~~',
143147
'Class:Incident/Attribute:tto_escalation_deadline' => 'TTO-Deadline',
144148
'Class:Incident/Attribute:tto_escalation_deadline+' => '',
145149
'Class:Incident/Attribute:sla_tto_passed' => 'SLA TTO verletzt',

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,10 @@
151151
'Class:Incident/Attribute:tto+' => 'Time To Own',
152152
'Class:Incident/Attribute:ttr' => 'TTR',
153153
'Class:Incident/Attribute:ttr+' => 'Time To Resolve',
154+
'Class:Incident/Attribute:tto_time_spent' => 'TTO time spent',
155+
'Class:Incident/Attribute:tto_time_spent+' => '',
156+
'Class:Incident/Attribute:ttr_time_spent' => 'TTR time spent',
157+
'Class:Incident/Attribute:ttr_time_spent+' => '',
154158
'Class:Incident/Attribute:tto_escalation_deadline' => 'TTO Deadline',
155159
'Class:Incident/Attribute:tto_escalation_deadline+' => '',
156160
'Class:Incident/Attribute:sla_tto_passed' => 'SLA tto passed',

0 commit comments

Comments
 (0)