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

Rename class PCsoftware into PCSoftware

Browse Source 
Add role attribute on link Person / Team

SVN:trunk[2288]
This commit is contained in:
Erwan Taloc
2012-10-18 09:51:13 +00:00
parent e938dfb5c9
commit 7d5e2637c4
3 changed files with 32 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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>

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

@@ -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+' => '',
));
//

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

@@ -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+' => '',
));
//