Add dependency between server and logical volume (Trac #617)

Add Pertual field for Licence (Trac #535)
Make Name mandatory for all CIS

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

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

@@ -2543,7 +2543,7 @@
 
 			case "depends on":
 			$aRels = array(
-
+				"volume" => array("sQuery"=>"SELECT LogicalVolume AS v JOIN lnkServerToVolume AS l1 ON l1.volume_id=v.id WHERE l1.server_id = :this->id", "bPropagate"=>true, "iDistance"=>10),
 			);
 			return array_merge($aRels, parent::GetRelationQueries($sRelCode));
 			break;
@@ -4546,7 +4546,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="documents_list" xsi:type="AttributeLinkedSetIndirect">
           <linked_class>lnkDocumentToPatch</linked_class>
@@ -4848,6 +4848,16 @@
           <default_value/>
           <is_null_allowed>true</is_null_allowed>
         </field>
+        <field id="perpetual" xsi:type="AttributeEnum">
+          <values>
+            <value>yes</value>
+            <value>no</value>
+          </values>
+          <sql>perpetual</sql>
+          <default_value>no</default_value>
+          <is_null_allowed>false</is_null_allowed>
+          <display_style>list</display_style>
+        </field>
       </fields>
       <methods/>
       <presentation>
@@ -4868,6 +4878,9 @@
             <item id="description">
               <rank>50</rank>
             </item>
+            <item id="perpetual">
+              <rank>55</rank>
+            </item>
             <item id="start_date">
               <rank>60</rank>
             </item>
@@ -4884,6 +4897,9 @@
             <item id="name">
               <rank>10</rank>
             </item>
+            <item id="perpetual">
+              <rank>15</rank>
+            </item>
             <item id="start_date">
               <rank>20</rank>
             </item>
@@ -4995,6 +5011,9 @@
             <item id="description">
               <rank>60</rank>
             </item>
+            <item id="perpetual">
+              <rank>65</rank>
+            </item>
             <item id="start_date">
               <rank>70</rank>
             </item>
@@ -5017,6 +5036,9 @@
             <item id="name">
               <rank>10</rank>
             </item>
+            <item id="perpetual">
+              <rank>15</rank>
+            </item>
             <item id="start_date">
               <rank>20</rank>
             </item>
@@ -5123,6 +5145,9 @@
             <item id="description">
               <rank>60</rank>
             </item>
+            <item id="perpetual">
+              <rank>65</rank>
+            </item>
             <item id="start_date">
               <rank>70</rank>
             </item>
@@ -5142,6 +5167,9 @@
             <item id="name">
               <rank>10</rank>
             </item>
+            <item id="perpetual">
+              <rank>15</rank>
+            </item>
             <item id="start_date">
               <rank>20</rank>
             </item>
@@ -5289,7 +5317,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>
       </fields>
       <methods/>
@@ -6519,7 +6547,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>
       </fields>
       <methods/>

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

@@ -1150,6 +1150,12 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:Licence/Attribute:end_date+' => '',
 	'Class:Licence/Attribute:licence_key' => 'Key',
 	'Class:Licence/Attribute:licence_key+' => '',
+	'Class:Licence/Attribute:perpetual' => 'Perpetual',
+	'Class:Licence/Attribute:perpetual+' => '',
+	'Class:Licence/Attribute:perpetual/Value:no' => 'no',
+	'Class:Licence/Attribute:perpetual/Value:no+' => 'no',
+	'Class:Licence/Attribute:perpetual/Value:yes' => 'yes',
+	'Class:Licence/Attribute:perpetual/Value:yes+' => 'yes',
 	'Class:Licence/Attribute:finalclass' => 'Type',
 	'Class:Licence/Attribute:finalclass+' => '',
 ));
@@ -1488,6 +1494,7 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:IPInterface/Attribute:ipaddress' => 'IP address',
 	'Class:IPInterface/Attribute:ipaddress+' => '',
 
+
 	'Class:IPInterface/Attribute:macaddress' => 'MAC address',
 	'Class:IPInterface/Attribute:macaddress+' => '',
 	'Class:IPInterface/Attribute:comment' => 'Comment',
@@ -1653,6 +1660,7 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:Group/Attribute:type' => 'Type',
 	'Class:Group/Attribute:type+' => '',
 	'Class:Group/Attribute:parent_id' => 'Parent Group',
+
 	'Class:Group/Attribute:parent_id+' => '',
 	'Class:Group/Attribute:parent_name' => 'Name',
 	'Class:Group/Attribute:parent_name+' => '',

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

@@ -1101,6 +1101,12 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:Licence/Attribute:end_date+' => '',
 	'Class:Licence/Attribute:licence_key' => 'Clé',
 	'Class:Licence/Attribute:licence_key+' => '',
+	'Class:Licence/Attribute:perpetual' => 'Perpetuelle',
+	'Class:Licence/Attribute:perpetual+' => '',
+	'Class:Licence/Attribute:perpetual/Value:no' => 'non',
+	'Class:Licence/Attribute:perpetual/Value:no+' => 'non',
+	'Class:Licence/Attribute:perpetual/Value:yes' => 'oui',
+	'Class:Licence/Attribute:perpetual/Value:yes+' => 'oui',
 	'Class:Licence/Attribute:finalclass' => 'Type',
 	'Class:Licence/Attribute:finalclass+' => '',
 ));