composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-23 10:38:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Change Name into Last Name for a object person in English dictionary (Trac #530)

Browse Source 
Fix icone issue for change mgmt
Allow selection of Location defined in each parent location for Person and Physical Devices (Trac #412)
Make sure all names are mandatory in the module Service Management , Service Management Provider (Trac #530)
Fix wrong impact rules for storage system

SVN:trunk[2492]
This commit is contained in:
Erwan Taloc
2012-12-01 12:46:23 +00:00
parent 14520dabc0
commit b0c48ce2a7
6 changed files with 19 additions and 17 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

@@ -23,7 +23,7 @@
</attributes>
</naming>
<display_template/>
<icon>../modules/itop-change-mgmt-itil/images/change.png</icon>
<icon>images/change.png</icon>
<reconciliation>
<attributes>
<attribute id="ref"/>

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

@@ -490,7 +490,7 @@
<is_null_allowed>true</is_null_allowed>
</field>
<field id="location_id" xsi:type="AttributeExternalKey">
<filter><![CDATA[SELECT Location AS L WHERE L.org_id = :this->org_id]]></filter>
<filter><![CDATA[SELECT l FROM Organization AS child JOIN Organization AS root ON child.parent_id BELOW root.id JOIN Location AS l ON l.org_id=root.id WHERE child.id=:this->org_id]]></filter>
<dependencies>
<attribute id="org_id"/>
</dependencies>
@@ -1487,7 +1487,7 @@
<is_null_allowed>true</is_null_allowed>
</field>
<field id="location_id" xsi:type="AttributeExternalKey">
<filter><![CDATA[SELECT Location WHERE org_id= :this->org_id]]></filter>
<filter><![CDATA[SELECT l FROM Organization AS child JOIN Organization AS root ON child.parent_id BELOW root.id JOIN Location AS l ON l.org_id=root.id WHERE child.id= :this->org_id]]></filter>
<dependencies>
<attribute id="org_id"/>
</dependencies>

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

@@ -179,6 +179,8 @@ Dict::Add('EN US', 'English', 'English', array(
Dict::Add('EN US', 'English', 'English', array(
'Class:Person' => 'Person',
'Class:Person+' => '',
'Class:Person/Attribute:name' => 'Last Name',
'Class:Person/Attribute:name+' => '',
'Class:Person/Attribute:first_name' => 'First Name',
'Class:Person/Attribute:first_name+' => '',
'Class:Person/Attribute:employee_number' => 'Employee number',

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

@@ -917,7 +917,7 @@
<field id="name" xsi:type="AttributeString">
<sql>name</sql>
<default_value/>
<is_null_allowed>true</is_null_allowed>
<is_null_allowed>false</is_null_allowed>
</field>
<field id="services_list" xsi:type="AttributeLinkedSet">
<linked_class>Service</linked_class>
@@ -985,7 +985,7 @@
<field id="name" xsi:type="AttributeString">
<sql>name</sql>
<default_value/>
<is_null_allowed>true</is_null_allowed>
<is_null_allowed>false</is_null_allowed>
</field>
<field id="org_id" xsi:type="AttributeExternalKey">
<sql>org_id</sql>
@@ -1316,7 +1316,7 @@
<field id="name" xsi:type="AttributeString">
<sql>name</sql>
<default_value/>
<is_null_allowed>true</is_null_allowed>
<is_null_allowed>false</is_null_allowed>
</field>
<field id="description" xsi:type="AttributeText">
<sql>description</sql>
@@ -1460,7 +1460,7 @@
<field id="name" xsi:type="AttributeString">
<sql>name</sql>
<default_value/>
<is_null_allowed>true</is_null_allowed>
<is_null_allowed>false</is_null_allowed>
</field>
<field id="description" xsi:type="AttributeText">
<sql>description</sql>
@@ -1567,7 +1567,7 @@
<field id="name" xsi:type="AttributeString">
<sql>name</sql>
<default_value/>
<is_null_allowed>true</is_null_allowed>
<is_null_allowed>false</is_null_allowed>
</field>
<field id="priority" xsi:type="AttributeEnum">
<values>
@@ -2097,7 +2097,7 @@
<field id="name" xsi:type="AttributeString">
<sql>name</sql>
<default_value/>
<is_null_allowed>true</is_null_allowed>
<is_null_allowed>false</is_null_allowed>
</field>
<field id="org_id" xsi:type="AttributeExternalKey">
<sql>org_id</sql>

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

@@ -890,7 +890,7 @@
<field id="name" xsi:type="AttributeString">
<sql>name</sql>
<default_value/>
<is_null_allowed>true</is_null_allowed>
<is_null_allowed>false</is_null_allowed>
</field>
<field id="services_list" xsi:type="AttributeLinkedSet">
<linked_class>Service</linked_class>
@@ -958,7 +958,7 @@
<field id="name" xsi:type="AttributeString">
<sql>name</sql>
<default_value/>
<is_null_allowed>true</is_null_allowed>
<is_null_allowed>false</is_null_allowed>
</field>
<field id="org_id" xsi:type="AttributeExternalKey">
<sql>org_id</sql>
@@ -1311,7 +1311,7 @@
<field id="name" xsi:type="AttributeString">
<sql>name</sql>
<default_value/>
<is_null_allowed>true</is_null_allowed>
<is_null_allowed>false</is_null_allowed>
</field>
<field id="description" xsi:type="AttributeText">
<sql>description</sql>
@@ -1455,7 +1455,7 @@
<field id="name" xsi:type="AttributeString">
<sql>name</sql>
<default_value/>
<is_null_allowed>true</is_null_allowed>
<is_null_allowed>false</is_null_allowed>
</field>
<field id="description" xsi:type="AttributeText">
<sql>description</sql>
@@ -1562,7 +1562,7 @@
<field id="name" xsi:type="AttributeString">
<sql>name</sql>
<default_value/>
<is_null_allowed>true</is_null_allowed>
<is_null_allowed>false</is_null_allowed>
</field>
<field id="priority" xsi:type="AttributeEnum">
<values>
@@ -2092,7 +2092,7 @@
<field id="name" xsi:type="AttributeString">
<sql>name</sql>
<default_value/>
<is_null_allowed>true</is_null_allowed>
<is_null_allowed>false</is_null_allowed>
</field>
<field id="org_id" xsi:type="AttributeExternalKey">
<sql>org_id</sql>

4
datamodels/2.x/itop-storage-mgmt/datamodel.itop-storage-mgmt.xml
View File

@@ -1434,7 +1434,7 @@
case 'depends on':
$aRels = array(
"sotragesystem" => array("sQuery"=>"SELECT StorageStystem AS storage WHERE storage.id = :this->storagesystem_id", "bPropagate"=>true, "iDistance"=>5),
"sotragesystem" => array("sQuery"=>"SELECT StorageSystem AS storage WHERE storage.id = :this->storagesystem_id", "bPropagate"=>true, "iDistance"=>5),
);
return array_merge($aRels, parent::GetRelationQueries($sRelCode));
break;
@@ -1749,4 +1749,4 @@
</definition>
</menu>
</menus>
</itop_design>
</itop_design>