From 7d5e2637c4f131105a604356c14eea65da53f9de Mon Sep 17 00:00:00 2001
From: Erwan Taloc <erwan.taloc@combodo.com>
Date: Thu, 18 Oct 2012 09:51:13 +0000
Subject: [PATCH] Rename class PCsoftware into PCSoftware Add role attribute on
 link Person / Team

SVN:trunk[2288]
---
 .../datamodel.itop-config-mgmt.xml              | 17 +++++++++++++++--
 .../en.dict.itop-config-mgmt.php                | 14 +++++++++-----
 .../fr.dict.itop-config-mgmt.php                | 12 ++++++++----
 3 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml b/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml
index 307f6eb27..9e20d4840 100755
--- a/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml
+++ b/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml
@@ -4441,7 +4441,7 @@
         </list>
       </presentation>
     </class>
-    <class id="PCsoftware" _delta="define">
+    <class id="PCSoftware" _delta="define">
       <parent>SoftwareInstance</parent>
       <properties>
         <category>bizmodel,searchable</category>
@@ -6108,7 +6108,7 @@
           <values>
             <value>Middleware</value>
             <value>DBserver</value>
-            <value>PCsoftware</value>
+            <value>PCSoftware</value>
             <value>OtherSoftware</value>
             <value>Webserver</value>
           </values>
@@ -8598,6 +8598,16 @@
           <extkey_attcode>person_id</extkey_attcode>
           <target_attcode>name</target_attcode>
         </field>
+        <field id="role_id" xsi:type="AttributeExternalKey">
+          <sql>role_id</sql>
+          <target_class>ContactType</target_class>
+          <is_null_allowed>true</is_null_allowed>
+          <on_target_delete>DEL_AUTO</on_target_delete>
+        </field>
+        <field id="role_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>role_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
       </fields>
       <methods/>
       <presentation>
@@ -8605,18 +8615,21 @@
           <items>
             <item>team_id</item>
             <item>person_id</item>
+            <item>role_id</item>
           </items>
         </details>
         <search>
           <items>
             <item>team_id</item>
             <item>person_id</item>
+            <item>role_id</item>
           </items>
         </search>
         <list>
           <items>
             <item>team_id</item>
             <item>person_id</item>
+            <item>role_id</item>
           </items>
         </list>
       </presentation>
diff --git a/datamodels/2.x/itop-config-mgmt/en.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/en.dict.itop-config-mgmt.php
index afe2e690d..e306391b7 100755
--- a/datamodels/2.x/itop-config-mgmt/en.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/en.dict.itop-config-mgmt.php
@@ -767,12 +767,12 @@ Dict::Add('EN US', 'English', 'English', array(
 ));
 
 //
-// Class: PCsoftware
+// Class: PCSoftware
 //
 
 Dict::Add('EN US', 'English', 'English', array(
-	'Class:PCsoftware' => 'PC software',
-	'Class:PCsoftware+' => '',
+	'Class:PCSoftware' => 'PC software',
+	'Class:PCSoftware+' => '',
 ));
 
 //
@@ -1065,8 +1065,8 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:Software/Attribute:type/Value:Middleware+' => 'Middleware',
 	'Class:Software/Attribute:type/Value:OtherSoftware' => 'Other Software',
 	'Class:Software/Attribute:type/Value:OtherSoftware+' => 'Other Software',
-	'Class:Software/Attribute:type/Value:PCsoftware' => 'PC software',
-	'Class:Software/Attribute:type/Value:PCsoftware+' => 'PC software',
+	'Class:Software/Attribute:type/Value:PCSoftware' => 'PC software',
+	'Class:Software/Attribute:type/Value:PCSoftware+' => 'PC software',
 	'Class:Software/Attribute:type/Value:Webserver' => 'Web server',
 	'Class:Software/Attribute:type/Value:Webserver+' => 'Web server',
 	'Class:Software/Attribute:softwareinstance_list' => 'Software instances',
@@ -1619,6 +1619,10 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:lnkPersonToTeam/Attribute:person_id+' => '',
 	'Class:lnkPersonToTeam/Attribute:person_name' => 'Person name',
 	'Class:lnkPersonToTeam/Attribute:person_name+' => '',
+	'Class:lnkPersonToTeam/Attribute:role_id' => 'Role',
+	'Class:lnkPersonToTeam/Attribute:role_id+' => '',
+	'Class:lnkPersonToTeam/Attribute:role_name' => 'Role name',
+	'Class:lnkPersonToTeam/Attribute:role_name+' => '',
 ));
 
 //
diff --git a/datamodels/2.x/itop-config-mgmt/fr.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/fr.dict.itop-config-mgmt.php
index 6db8ace68..e196cc624 100755
--- a/datamodels/2.x/itop-config-mgmt/fr.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/fr.dict.itop-config-mgmt.php
@@ -720,11 +720,11 @@ Dict::Add('FR FR', 'French', 'Français', array(
 ));
 
 //
-// Class: PCsoftware
+// Class: PCSoftware
 //
 
 Dict::Add('FR FR', 'French', 'Français', array(
-	'Class:PCsoftware' => 'Logicel PC',
+	'Class:PCSoftware' => 'Logicel PC',
 	'Class:PCsoftware+' => '',
 ));
 
@@ -1018,8 +1018,8 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:Software/Attribute:type/Value:Middleware+' => 'Middleware',
 	'Class:Software/Attribute:type/Value:OtherSoftware' => 'Autre logiciel',
 	'Class:Software/Attribute:type/Value:OtherSoftware+' => 'Autre logiciel',
-	'Class:Software/Attribute:type/Value:PCsoftware' => 'Logiciel PC',
-	'Class:Software/Attribute:type/Value:PCsoftware+' => 'Logiciel PC',
+	'Class:Software/Attribute:type/Value:PCSoftware' => 'Logiciel PC',
+	'Class:Software/Attribute:type/Value:PCSoftware+' => 'Logiciel PC',
 	'Class:Software/Attribute:type/Value:Webserver' => 'Serveur Web',
 	'Class:Software/Attribute:type/Value:Webserver+' => 'Serveur Web',
 	'Class:Software/Attribute:softwareinstance_list' => 'Instances logiciels',
@@ -1570,6 +1570,10 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:lnkPersonToTeam/Attribute:person_id+' => '',
 	'Class:lnkPersonToTeam/Attribute:person_name' => 'Nom Personne',
 	'Class:lnkPersonToTeam/Attribute:person_name+' => '',
+	'Class:lnkPersonToTeam/Attribute:role_id' => 'Rôle',
+	'Class:lnkPersonToTeam/Attribute:role_id+' => '',
+	'Class:lnkPersonToTeam/Attribute:role_name' => 'Nom Role',
+	'Class:lnkPersonToTeam/Attribute:role_name+' => '',
 ));
 
 //