composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-24 11:08:45 +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

16
dictionaries/dictionary.itop.core.php
View File

@@ -194,8 +194,8 @@ Dict::Add('EN US', 'English', 'English', array(
'Class:CMDBChangeOp/Attribute:objclass+' => 'object class',
'Class:CMDBChangeOp/Attribute:objkey' => 'object id',
'Class:CMDBChangeOp/Attribute:objkey+' => 'object id',
'Class:CMDBChangeOp/Attribute:finalclass' => 'type',
'Class:CMDBChangeOp/Attribute:finalclass+' => '',
'Class:CMDBChangeOp/Attribute:finalclass' => 'CMDBChangeOp sub-class',
'Class:CMDBChangeOp/Attribute:finalclass+' => 'Name of the final class',
));
//
@@ -290,8 +290,8 @@ Dict::Add('EN US', 'English', 'English', array(
'Class:Event/Attribute:date+' => 'date and time at which the changes have been recorded',
'Class:Event/Attribute:userinfo' => 'User info',
'Class:Event/Attribute:userinfo+' => 'identification of the user that was doing the action that triggered this event',
'Class:Event/Attribute:finalclass' => 'Type',
'Class:Event/Attribute:finalclass+' => '',
'Class:Event/Attribute:finalclass' => 'Event sub-class',
'Class:Event/Attribute:finalclass+' => 'Name of the final class',
));
//
@@ -429,8 +429,8 @@ Dict::Add('EN US', 'English', 'English', array(
'Class:Action/Attribute:status/Value:disabled+' => 'Inactive',
'Class:Action/Attribute:trigger_list' => 'Related Triggers',
'Class:Action/Attribute:trigger_list+' => 'Triggers linked to this action',
'Class:Action/Attribute:finalclass' => 'Type',
'Class:Action/Attribute:finalclass+' => '',
'Class:Action/Attribute:finalclass' => 'Action sub-class',
'Class:Action/Attribute:finalclass+' => 'Name of the final class',
));
//
@@ -486,8 +486,8 @@ Dict::Add('EN US', 'English', 'English', array(
'Class:Trigger/Attribute:description+' => 'one line description',
'Class:Trigger/Attribute:action_list' => 'Triggered actions',
'Class:Trigger/Attribute:action_list+' => 'Actions performed when the trigger is activated',
'Class:Trigger/Attribute:finalclass' => 'Type',
'Class:Trigger/Attribute:finalclass+' => '',
'Class:Trigger/Attribute:finalclass' => 'Trigger sub-class',
'Class:Trigger/Attribute:finalclass+' => 'Name of the final class',
));
//