composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-20 17:18:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug #751. Check that class Logical Volume exists when checking dependencies of a Server

Browse Source 
Add attribute Subnet name on Subnet element

SVN:trunk[2888]
This commit is contained in:
Erwan Taloc
2013-10-11 10:24:32 +00:00
parent e34516745c
commit ef26f395bd
2 changed files with 31 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2561,20 +2561,24 @@
switch ($sRelCode)
{
case "impacts":
$aRels = array();
if (class_exists('Hypervisor'))
{
$aRels = array(
"device" => array("sQuery"=>"SELECT Hypervisor WHERE server_id = :this->id", "bPropagate"=>true, "iDistance"=>10),
);
}
$aRels = array();
if (class_exists('Hypervisor'))
{
$aRels = array(
"device" => array("sQuery"=>"SELECT Hypervisor WHERE server_id = :this->id", "bPropagate"=>true, "iDistance"=>10),
);
}
return array_merge($aRels, parent::GetRelationQueries($sRelCode));
break;
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),
);
case "depends on":
$aRels = array();
if (class_exists('LogicalVolume'))
{
$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;
@@ -6429,6 +6433,11 @@
<default_value/>
<is_null_allowed>true</is_null_allowed>
</field>
<field id="subnet_name" xsi:type="AttributeString">
<sql>subnet_name</sql>
<default_value/>
<is_null_allowed>true</is_null_allowed>
</field>
<field id="org_id" xsi:type="AttributeExternalKey">
<sql>org_id</sql>
<target_class>Organization</target_class>
@@ -6516,6 +6525,9 @@
<item id="ip_mask">
<rank>20</rank>
</item>
<item id="subnet_name">
<rank>25</rank>
</item>
<item id="org_id">
<rank>30</rank>
</item>
@@ -6532,6 +6544,9 @@
<item id="ip_mask">
<rank>20</rank>
</item>
<item id="subnet_name">
<rank>25</rank>
</item>
<item id="org_id">
<rank>30</rank>
</item>
@@ -6548,6 +6563,9 @@
<item id="ip_mask">
<rank>20</rank>
</item>
<item id="subnet_name">
<rank>25</rank>
</item>
<item id="org_id">
<rank>30</rank>
</item>

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

@@ -1463,6 +1463,8 @@ Dict::Add('EN US', 'English', 'English', array(
'Class:Subnet+' => '',
'Class:Subnet/Attribute:description' => 'Description',
'Class:Subnet/Attribute:description+' => '',
'Class:Subnet/Attribute:subnet_name' => 'Subnet name',
'Class:Subnet/Attribute:subnet_name+' => '',
'Class:Subnet/Attribute:org_id' => 'Owner organization',
'Class:Subnet/Attribute:org_id+' => '',
'Class:Subnet/Attribute:org_name' => 'Name',