composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-20 15:52:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

#1314 (N°585,586,591) allow to use finalclass (sub-class name) as reconciliation key when loading by CSV import, relationship defined on an abstract class.

Browse Source 
#1387 (N°577) fixing old issue with CSV import of relationship with Documents

SVN:trunk[4576]
This commit is contained in:
Vincent Dumas
2017-03-13 16:56:03 +00:00
parent b3a0c6119e
commit 5f82c78dc7
23 changed files with 103 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
datamodels/2.x/itop-change-mgmt-itil/datamodel.itop-change-mgmt-itil.xml
View File

@@ -26,6 +26,7 @@
<reconciliation>
<attributes>
<attribute id="ref"/>
<attribute id="finalclass"/>
</attributes>
</reconciliation>
<order>
@@ -2001,6 +2002,7 @@
<reconciliation>
<attributes>
<attribute id="ref"/>
<attribute id="finalclass"/>
</attributes>
</reconciliation>
<order>

13
datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml
View File

@@ -293,6 +293,7 @@
<attribute id="org_id"/>
<attribute id="org_name"/>
<attribute id="email"/>
<attribute id="finalclass"/>
</attributes>
</reconciliation>
</properties>
@@ -880,7 +881,10 @@
<icon>images/document.png</icon>
<reconciliation>
<attributes>
<attribute id=""/>
<attribute id="name"/>
<attribute id="org_id"/>
<attribute id="org_name"/>
<attribute id="finalclass"/>
</attributes>
</reconciliation>
</properties>
@@ -1866,6 +1870,7 @@
<attribute id="name"/>
<attribute id="org_id"/>
<attribute id="organization_name"/>
<attribute id="finalclass"/>
</attributes>
</reconciliation>
</properties>
@@ -2043,6 +2048,7 @@
<attribute id="name"/>
<attribute id="org_id"/>
<attribute id="organization_name"/>
<attribute id="finalclass"/>
</attributes>
</reconciliation>
</properties>
@@ -4536,6 +4542,7 @@
<reconciliation>
<attributes>
<attribute id="name"/>
<attribute id="finalclass"/>
</attributes>
</reconciliation>
</properties>
@@ -4790,6 +4797,7 @@
<attribute id="name"/>
<attribute id="org_id"/>
<attribute id="organization_name"/>
<attribute id="finalclass"/>
</attributes>
</reconciliation>
</properties>
@@ -5300,6 +5308,7 @@
<reconciliation>
<attributes>
<attribute id="name"/>
<attribute id="finalclass"/>
</attributes>
</reconciliation>
</properties>
@@ -6733,6 +6742,7 @@
<reconciliation>
<attributes>
<attribute id="name"/>
<attribute id="finalclass"/>
</attributes>
</reconciliation>
</properties>
@@ -6787,6 +6797,7 @@
<reconciliation>
<attributes>
<attribute id="name"/>
<attribute id="finalclass"/>
</attributes>
</reconciliation>
</properties>

28
datamodels/2.x/itop-config-mgmt/en.dict.itop-config-mgmt.php
View File

@@ -168,8 +168,8 @@ Dict::Add('EN US', 'English', 'English', array(
'Class:Contact/Attribute:function+' => '',
'Class:Contact/Attribute:cis_list' => 'CIs',
'Class:Contact/Attribute:cis_list+' => 'All the configuration items linked to this contact',
'Class:Contact/Attribute:finalclass' => 'Contact Type',
'Class:Contact/Attribute:finalclass+' => '',
'Class:Contact/Attribute:finalclass' => 'Contact sub-class',
'Class:Contact/Attribute:finalclass+' => 'Name of the final class',
));
//
@@ -253,8 +253,8 @@ Dict::Add('EN US', 'English', 'English', array(
'Class:Document/Attribute:contracts_list+' => 'All the contracts linked to this document',
'Class:Document/Attribute:services_list' => 'Services',
'Class:Document/Attribute:services_list+' => 'All the services linked to this document',
'Class:Document/Attribute:finalclass' => 'Document Type',
'Class:Document/Attribute:finalclass+' => '',
'Class:Document/Attribute:finalclass' => 'Document sub-class',
'Class:Document/Attribute:finalclass+' => 'Name of the final class',
));
//
@@ -329,8 +329,8 @@ Dict::Add('EN US', 'English', 'English', array(
'Class:FunctionalCI/Attribute:softwares_list+' => 'All the softwares installed on this configuration item',
'Class:FunctionalCI/Attribute:tickets_list' => 'Tickets',
'Class:FunctionalCI/Attribute:tickets_list+' => 'All the tickets for this configuration item',
'Class:FunctionalCI/Attribute:finalclass' => 'CI Type',
'Class:FunctionalCI/Attribute:finalclass+' => '',
'Class:FunctionalCI/Attribute:finalclass' => 'CI sub-class',
'Class:FunctionalCI/Attribute:finalclass+' => 'Name of the final class',
'Class:FunctionalCI/Tab:OpenedTickets' => 'Active Tickets',
));
@@ -1114,8 +1114,8 @@ Dict::Add('EN US', 'English', 'English', array(
'Class:Patch/Attribute:documents_list+' => 'All the documents linked to this patch',
'Class:Patch/Attribute:description' => 'Description',
'Class:Patch/Attribute:description+' => '',
'Class:Patch/Attribute:finalclass' => 'Type',
'Class:Patch/Attribute:finalclass+' => '',
'Class:Patch/Attribute:finalclass' => 'Patch sub-class',
'Class:Patch/Attribute:finalclass+' => 'Name of the final class',
));
//
@@ -1179,8 +1179,8 @@ Dict::Add('EN US', 'English', 'English', array(
'Class:Licence/Attribute:perpetual/Value:no+' => 'no',
'Class:Licence/Attribute:perpetual/Value:yes' => 'yes',
'Class:Licence/Attribute:perpetual/Value:yes+' => 'yes',
'Class:Licence/Attribute:finalclass' => 'Type',
'Class:Licence/Attribute:finalclass+' => '',
'Class:Licence/Attribute:finalclass' => 'Licence sub-class',
'Class:Licence/Attribute:finalclass+' => 'Name of the final class',
));
//
@@ -1241,8 +1241,8 @@ Dict::Add('EN US', 'English', 'English', array(
'Class:Typology+' => '',
'Class:Typology/Attribute:name' => 'Name',
'Class:Typology/Attribute:name+' => '',
'Class:Typology/Attribute:finalclass' => 'Type',
'Class:Typology/Attribute:finalclass+' => '',
'Class:Typology/Attribute:finalclass' => 'Typology sub-class',
'Class:Typology/Attribute:finalclass+' => 'Name of the final class',
));
//
@@ -1547,8 +1547,8 @@ Dict::Add('EN US', 'English', 'English', array(
'Class:NetworkInterface+' => '',
'Class:NetworkInterface/Attribute:name' => 'Name',
'Class:NetworkInterface/Attribute:name+' => '',
'Class:NetworkInterface/Attribute:finalclass' => 'Type',
'Class:NetworkInterface/Attribute:finalclass+' => '',
'Class:NetworkInterface/Attribute:finalclass' => 'NetworkInterface sub-class',
'Class:NetworkInterface/Attribute:finalclass+' => 'Name of the final class',
));
//

28
datamodels/2.x/itop-config-mgmt/fr.dict.itop-config-mgmt.php
View File

@@ -115,8 +115,8 @@ Dict::Add('FR FR', 'French', 'Français', array(
'Class:Contact/Attribute:function+' => '',
'Class:Contact/Attribute:cis_list' => 'CIs',
'Class:Contact/Attribute:cis_list+' => '',
'Class:Contact/Attribute:finalclass' => 'Type de contact',
'Class:Contact/Attribute:finalclass+' => '',
'Class:Contact/Attribute:finalclass' => 'Sous-classe de Contact',
'Class:Contact/Attribute:finalclass+' => 'Nom de la classe instanciable',
));
//
@@ -198,8 +198,8 @@ Dict::Add('FR FR', 'French', 'Français', array(
'Class:Document/Attribute:contracts_list+' => '',
'Class:Document/Attribute:services_list' => 'Services',
'Class:Document/Attribute:services_list+' => '',
'Class:Document/Attribute:finalclass' => 'Type de document',
'Class:Document/Attribute:finalclass+' => '',
'Class:Document/Attribute:finalclass' => 'Sous-classe de Document',
'Class:Document/Attribute:finalclass+' => 'Nom de la classe instanciable',
));
//
@@ -274,8 +274,8 @@ Dict::Add('FR FR', 'French', 'Français', array(
'Class:FunctionalCI/Attribute:softwares_list+' => '',
'Class:FunctionalCI/Attribute:tickets_list' => 'Tickets',
'Class:FunctionalCI/Attribute:tickets_list+' => '',
'Class:FunctionalCI/Attribute:finalclass' => 'Type de CI',
'Class:FunctionalCI/Attribute:finalclass+' => '',
'Class:FunctionalCI/Attribute:finalclass' => 'Sous-classe de CI',
'Class:FunctionalCI/Attribute:finalclass+' => 'Nom de la classe instanciable',
'Class:FunctionalCI/Tab:OpenedTickets' => 'Tickets en cours',
));
@@ -1058,8 +1058,8 @@ Dict::Add('FR FR', 'French', 'Français', array(
'Class:Patch/Attribute:documents_list+' => '',
'Class:Patch/Attribute:description' => 'Description',
'Class:Patch/Attribute:description+' => '',
'Class:Patch/Attribute:finalclass' => 'Type',
'Class:Patch/Attribute:finalclass+' => '',
'Class:Patch/Attribute:finalclass' => 'Sous-classe de Patch',
'Class:Patch/Attribute:finalclass+' => 'Nom de la classe instanciable',
));
//
@@ -1123,8 +1123,8 @@ Dict::Add('FR FR', 'French', 'Français', array(
'Class:Licence/Attribute:perpetual/Value:no+' => 'non',
'Class:Licence/Attribute:perpetual/Value:yes' => 'oui',
'Class:Licence/Attribute:perpetual/Value:yes+' => 'oui',
'Class:Licence/Attribute:finalclass' => 'Type',
'Class:Licence/Attribute:finalclass+' => '',
'Class:Licence/Attribute:finalclass' => 'Sous-classe de License',
'Class:Licence/Attribute:finalclass+' => 'Nom de la classe instanciable',
));
//
@@ -1185,8 +1185,8 @@ Dict::Add('FR FR', 'French', 'Français', array(
'Class:Typology+' => '',
'Class:Typology/Attribute:name' => 'Nom',
'Class:Typology/Attribute:name+' => '',
'Class:Typology/Attribute:finalclass' => 'Type',
'Class:Typology/Attribute:finalclass+' => '',
'Class:Typology/Attribute:finalclass' => 'Sous-classe de Typologie',
'Class:Typology/Attribute:finalclass+' => 'Nom de la classe instanciable',
));
//
@@ -1486,8 +1486,8 @@ Dict::Add('FR FR', 'French', 'Français', array(
'Class:NetworkInterface+' => '',
'Class:NetworkInterface/Attribute:name' => 'Nom',
'Class:NetworkInterface/Attribute:name+' => '',
'Class:NetworkInterface/Attribute:finalclass' => 'Type',
'Class:NetworkInterface/Attribute:finalclass+' => '',
'Class:NetworkInterface/Attribute:finalclass' => 'Sous-classe d\'Interface Réseau',
'Class:NetworkInterface/Attribute:finalclass+' => 'Nom de la classe instanciable',
));
//

1
datamodels/2.x/itop-datacenter-mgmt/datamodel.itop-datacenter-mgmt.xml
View File

@@ -402,6 +402,7 @@
<attribute id="name"/>
<attribute id="org_id"/>
<attribute id="organization_name"/>
<attribute id="finalclass"/>
</attributes>
</reconciliation>
</properties>

1
datamodels/2.x/itop-endusers-devices/datamodel.itop-enduser-devices.xml
View File

@@ -22,6 +22,7 @@
<attribute id="name"/>
<attribute id="org_id"/>
<attribute id="organization_name"/>
<attribute id="finalclass"/>
</attributes>
</reconciliation>
</properties>

1
datamodels/2.x/itop-service-mgmt-provider/datamodel.itop-service-mgmt-provider.xml
View File

@@ -65,6 +65,7 @@
<reconciliation>
<attributes>
<attribute id="name"/>
<attribute id="finalclass"/>
</attributes>
</reconciliation>
</properties>

4
datamodels/2.x/itop-service-mgmt-provider/en.dict.itop-service-mgmt-provider.php
View File

@@ -147,8 +147,8 @@ Dict::Add('EN US', 'English', 'English', array(
'Class:Contract/Attribute:status/Value:obsolete+' => 'obsolete',
'Class:Contract/Attribute:status/Value:production' => 'production',
'Class:Contract/Attribute:status/Value:production+' => 'production',
'Class:Contract/Attribute:finalclass' => 'Contract type',
'Class:Contract/Attribute:finalclass+' => '',
'Class:Contract/Attribute:finalclass' => 'Contract sub-class',
'Class:Contract/Attribute:finalclass+' => 'Name of the final class',
));
//

4
datamodels/2.x/itop-service-mgmt-provider/fr.dict.itop-service-mgmt-provider.php
View File

@@ -93,8 +93,8 @@ Dict::Add('FR FR', 'French', 'Français', array(
'Class:Contract/Attribute:status/Value:obsolete+' => 'obsolète',
'Class:Contract/Attribute:status/Value:production' => 'production',
'Class:Contract/Attribute:status/Value:production+' => 'production',
'Class:Contract/Attribute:finalclass' => 'Type',
'Class:Contract/Attribute:finalclass+' => '',
'Class:Contract/Attribute:finalclass' => 'Sous-classe de Contrat',
'Class:Contract/Attribute:finalclass+' => 'Nom de la classe instanciable',
));
//

13
datamodels/2.x/itop-service-mgmt/datamodel.itop-service-mgmt.xml
View File

@@ -65,6 +65,11 @@
<reconciliation>
<attributes>
<attribute id="name"/>
<attribute id="org_id"/>
<attribute id="organization_name"/>
<attribute id="provider_id"/>
<attribute id="provider_name"/>
<attribute id="finalclass"/>
</attributes>
</reconciliation>
</properties>
@@ -354,6 +359,10 @@
<reconciliation>
<attributes>
<attribute id="name"/>
<attribute id="org_id"/>
<attribute id="organization_name"/>
<attribute id="provider_id"/>
<attribute id="provider_name"/>
</attributes>
</reconciliation>
</properties>
@@ -498,6 +507,10 @@
<reconciliation>
<attributes>
<attribute id="name"/>
<attribute id="org_id"/>
<attribute id="organization_name"/>
<attribute id="provider_id"/>
<attribute id="provider_name"/>
</attributes>
</reconciliation>
</properties>

4
datamodels/2.x/itop-service-mgmt/en.dict.itop-service-mgmt.php
View File

@@ -141,8 +141,8 @@ Dict::Add('EN US', 'English', 'English', array(
'Class:Contract/Attribute:status/Value:obsolete+' => 'obsolete',
'Class:Contract/Attribute:status/Value:production' => 'production',
'Class:Contract/Attribute:status/Value:production+' => 'production',
'Class:Contract/Attribute:finalclass' => 'Type',
'Class:Contract/Attribute:finalclass+' => '',
'Class:Contract/Attribute:finalclass' => 'Contract sub-class',
'Class:Contract/Attribute:finalclass+' => 'Name of the final class',
));
//
// Class: CustomerContract

8
datamodels/2.x/itop-service-mgmt/fr.dict.itop-service-mgmt.php
View File

@@ -92,8 +92,8 @@ Dict::Add('FR FR', 'French', 'Français', array(
'Class:Contract/Attribute:status/Value:obsolete+' => 'obsolète',
'Class:Contract/Attribute:status/Value:production' => 'production',
'Class:Contract/Attribute:status/Value:production+' => 'production',
'Class:Contract/Attribute:finalclass' => 'Type',
'Class:Contract/Attribute:finalclass+' => '',
'Class:Contract/Attribute:finalclass' => 'Sous-classe de Contrat',
'Class:Contract/Attribute:finalclass+' => 'Nom de la classe instanciable',
));
//
@@ -122,7 +122,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
'Class:ProviderContract/Attribute:coverage+' => '',
'Class:ProviderContract/Attribute:contracttype_id' => 'Type de contrat',
'Class:ProviderContract/Attribute:contracttype_id+' => '',
'Class:ProviderContract/Attribute:contracttype_name' => 'Nom type de contrat',
'Class:ProviderContract/Attribute:contracttype_name' => 'Nom Type de contrat',
'Class:ProviderContract/Attribute:contracttype_name+' => '',
));
@@ -442,7 +442,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
'Class:DeliveryModel/Attribute:org_id' => 'Organisation',
'Class:DeliveryModel/Attribute:org_id+' => '',
'Class:DeliveryModel/Attribute:organization_name' => 'Nom organisation',
'Class:DeliveryModel/Attribute:organization_name+' => 'Common name',
'Class:DeliveryModel/Attribute:organization_name+' => '',
'Class:DeliveryModel/Attribute:description' => 'Description',
'Class:DeliveryModel/Attribute:description+' => '',
'Class:DeliveryModel/Attribute:contacts_list' => 'Contacts',

1
datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
View File

@@ -43,6 +43,7 @@
<reconciliation>
<attributes>
<attribute id="ref"/>
<attribute id="finalclass"/>
</attributes>
</reconciliation>
</properties>

4
datamodels/2.x/itop-tickets/en.dict.itop-tickets.php
View File

@@ -80,8 +80,8 @@ Dict::Add('EN US', 'English', 'English', array(
'Class:Ticket/Attribute:functionalcis_list+' => 'All the configuration items impacted by this ticket. Items marked as "Computed" have been automatically marked as impacted. Items marked as "Not impacted" are excluded from the impact.',
'Class:Ticket/Attribute:workorders_list' => 'Work orders',
'Class:Ticket/Attribute:workorders_list+' => 'All the work orders for this ticket',
'Class:Ticket/Attribute:finalclass' => 'Type',
'Class:Ticket/Attribute:finalclass+' => '',
'Class:Ticket/Attribute:finalclass' => 'Ticket sub-class',
'Class:Ticket/Attribute:finalclass+' => 'Name of the final class',
'Class:Ticket/Attribute:operational_status' => 'Operational status',
'Class:Ticket/Attribute:operational_status+' => 'Computed after the detailed status',
'Class:Ticket/Attribute:operational_status/Value:ongoing' => 'Ongoing',

4
datamodels/2.x/itop-tickets/fr.dict.itop-tickets.php
View File

@@ -67,8 +67,8 @@ Dict::Add('FR FR', 'French', 'Français', array(
'Class:Ticket/Attribute:functionalcis_list+' => 'Tous les éléments de configuration impactés par ce ticket. Les éléments marqués comme "Calculés" sont le résultat du calcul de l\'analyse d\'impact. Les éléments marqués comme "Non impactés" sont exclus de cette analyse.',
'Class:Ticket/Attribute:workorders_list' => 'Tâches',
'Class:Ticket/Attribute:workorders_list+' => '',
'Class:Ticket/Attribute:finalclass' => 'Type',
'Class:Ticket/Attribute:finalclass+' => '',
'Class:Ticket/Attribute:finalclass' => 'Sous-classe de Ticket',
'Class:Ticket/Attribute:finalclass+' => 'Nom de la classe instanciable',
'Class:Ticket/Attribute:operational_status' => 'Statut opérationnel',
'Class:Ticket/Attribute:operational_status+' => 'Calculé à partir du statut détaillé',
'Class:Ticket/Attribute:operational_status/Value:ongoing' => 'En cours',

1
datamodels/2.x/itop-virtualization-mgmt/datamodel.itop-virtualization-mgmt.xml
View File

@@ -145,6 +145,7 @@
<attribute id="name"/>
<attribute id="org_id"/>
<attribute id="organization_name"/>
<attribute id="finalclass"/>
</attributes>
</reconciliation>
</properties>