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

Rollback (temporarily) to fix the issue with linksets dependent on both sides.

Browse Source 
SVN:trunk[2411]
This commit is contained in:
Denis Flaven
2012-10-30 11:23:22 +00:00
parent 2d04bfe2b9
commit 7cb5d60dd3
2 changed files with 0 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/metamodel.class.php
View File

@@ -1753,11 +1753,6 @@ abstract class MetaModel
self::$m_aIgnoredAttributes[$sTargetClass][$oAtt->GetCode()] = $sRemoteClass;
return;
}
elseif ($oAtt->IsIndirect() && !self::IsValidAttCode($sRemoteClass, $oAtt->GetExtKeyToRemote()))
{
self::$m_aIgnoredAttributes[$sTargetClass][$oAtt->GetCode()] = $sRemoteClass;
return;
}
}
elseif($oAtt->IsExternalKey())
{

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

@@ -1414,14 +1414,6 @@
<ext_key_to_remote>server_id</ext_key_to_remote>
<duplicates/>
</field>
<field id="virtualdevices_list" xsi:type="AttributeLinkedSetIndirect">
<linked_class>lnkVirtualDeviceToVolume</linked_class>
<ext_key_to_me>volume_id</ext_key_to_me>
<count_min>0</count_min>
<count_max>0</count_max>
<ext_key_to_remote>virtualdevice_id</ext_key_to_remote>
<duplicates/>
</field>
</fields>
<methods>
<method id="GetRelationQueries">
@@ -1437,10 +1429,6 @@
// Actually this should be limited to the Software instances based on a DBServer Application type...
"server" => array("sQuery"=>"SELECT Server AS s JOIN lnkServerToVolume AS l1 ON l1.server_id=s.id WHERE l1.volume_id = :this->id", "bPropagate"=>true, "iDistance"=>5),
);
if (class_exists('VirtualDevice'))
{
$aRels["virtualdevice"] = array("sQuery"=>"SELECT VirtualDevice AS vd JOIN lnkVirtualDeviceToVolume AS l1 ON l1.virtualdevice_id=vd.id WHERE l1.volume_id = :this->id", "bPropagate"=>true, "iDistance"=>5);
}
return array_merge($aRels, parent::GetRelationQueries($sRelCode));
break;
@@ -1481,9 +1469,6 @@
<item id="servers_list">
<rank>70</rank>
</item>
<item id="virtualdevices_list">
<rank>80</rank>
</item>
</items>
</details>
<search>
@@ -1611,95 +1596,6 @@
</list>
</presentation>
</class>
<class id="lnkVirtualDeviceToVolume" _delta="define">
<parent>cmdbAbstractObject</parent>
<properties>
<category>bizmodel,configmgmt</category>
<abstract>false</abstract>
<key_type>autoincrement</key_type>
<db_table>lnkvirtualdevicetovolume</db_table>
<db_key_field>id</db_key_field>
<db_final_class_field/>
<naming>
<format>%1$s</format>
<attributes>
<attribute id="volume_id"/>
</attributes>
</naming>
<display_template/>
<icon/>
<reconciliation>
<attributes>
</attributes>
</reconciliation>
</properties>
<fields>
<field id="volume_id" xsi:type="AttributeExternalKey">
<sql>volume_id</sql>
<target_class>LogicalVolume</target_class>
<is_null_allowed>false</is_null_allowed>
<on_target_delete>DEL_AUTO</on_target_delete>
</field>
<field id="volume_name" xsi:type="AttributeExternalField">
<extkey_attcode>volume_id</extkey_attcode>
<target_attcode>name</target_attcode>
</field>
<field id="virtualdevice_id" xsi:type="AttributeExternalKey">
<sql>virtualdevice_id</sql>
<target_class>VirtualDevice</target_class>
<is_null_allowed>false</is_null_allowed>
<on_target_delete>DEL_AUTO</on_target_delete>
</field>
<field id="virtualdevice_name" xsi:type="AttributeExternalField">
<extkey_attcode>virtualdevice_id</extkey_attcode>
<target_attcode>name</target_attcode>
</field>
<field id="size_used" xsi:type="AttributeString">
<sql>size_used</sql>
<default_value/>
<is_null_allowed>true</is_null_allowed>
</field>
</fields>
<methods/>
<presentation>
<details>
<items>
<item id="volume_id">
<rank>10</rank>
</item>
<item id="virtualdevice_id">
<rank>20</rank>
</item>
<item id="size_used">
<rank>30</rank>
</item>
</items>
</details>
<search>
<items>
<item id="volume_id">
<rank>10</rank>
</item>
<item id="virtualdevice_id">
<rank>20</rank>
</item>
</items>
</search>
<list>
<items>
<item id="volume_id">
<rank>10</rank>
</item>
<item id="virtualdevice_id">
<rank>20</rank>
</item>
<item id="size_used">
<rank>30</rank>
</item>
</items>
</list>
</presentation>
</class>
<class id="lnkSanToDatacenterDevice" _delta="define">
<parent>cmdbAbstractObject</parent>
<properties>