Selaa lähdekoodia

Change Name into Last Name for a object person in English dictionary (Trac #530)
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

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@2492 a333f486-631f-4898-b8df-5754b55c2be0

etaloc 12 vuotta sitten
vanhempi
commit
8bb99ff807

+ 1 - 1
datamodels/2.x/itop-change-mgmt-itil/datamodel.itop-change-mgmt-itil.xml

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

+ 2 - 2
datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml

@@ -490,7 +490,7 @@
           <is_null_allowed>true</is_null_allowed>
           <is_null_allowed>true</is_null_allowed>
         </field>
         </field>
         <field id="location_id" xsi:type="AttributeExternalKey">
         <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>
           <dependencies>
             <attribute id="org_id"/>
             <attribute id="org_id"/>
           </dependencies>
           </dependencies>
@@ -1487,7 +1487,7 @@
           <is_null_allowed>true</is_null_allowed>
           <is_null_allowed>true</is_null_allowed>
         </field>
         </field>
         <field id="location_id" xsi:type="AttributeExternalKey">
         <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>
           <dependencies>
             <attribute id="org_id"/>
             <attribute id="org_id"/>
           </dependencies>
           </dependencies>

+ 2 - 0
datamodels/2.x/itop-config-mgmt/en.dict.itop-config-mgmt.php

@@ -179,6 +179,8 @@ Dict::Add('EN US', 'English', 'English', array(
 Dict::Add('EN US', 'English', 'English', array(
 Dict::Add('EN US', 'English', 'English', array(
 	'Class:Person' => 'Person',
 	'Class:Person' => 'Person',
 	'Class: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' => 'First Name',
 	'Class:Person/Attribute:first_name+' => '',
 	'Class:Person/Attribute:first_name+' => '',
 	'Class:Person/Attribute:employee_number' => 'Employee number',
 	'Class:Person/Attribute:employee_number' => 'Employee number',

+ 6 - 6
datamodels/2.x/itop-service-mgmt-provider/datamodel.itop-service-mgmt-provider.xml

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

+ 6 - 6
datamodels/2.x/itop-service-mgmt/datamodel.itop-service-mgmt.xml

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

+ 2 - 2
datamodels/2.x/itop-storage-mgmt/datamodel.itop-storage-mgmt.xml

@@ -1434,7 +1434,7 @@
       
       
       case 'depends on':
       case 'depends on':
       $aRels = array(
       $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));
       return array_merge($aRels, parent::GetRelationQueries($sRelCode));
       break;
       break;
@@ -1749,4 +1749,4 @@
     </definition>
     </definition>
     </menu>
     </menu>
  </menus>
  </menus>
-</itop_design>
+</itop_design>