composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-18 06:48:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

ImageAttribute: only in XML version 1.3

Browse Source 
SVN:trunk[4131]
This commit is contained in:
Romain Quetiez
2016-05-24 19:55:08 +00:00
parent 1a5637352b
commit 4187b074a9
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2">
<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.3">
<classes>
<class id="Organization" _delta="define">
<parent>cmdbAbstractObject</parent>

9
setup/itopdesignformat.class.inc.php
View File

@@ -520,6 +520,15 @@ class iTopDesignFormat
$this->DeleteNode($oNode);
}
// Remove Image attributes
//
$oNodeList = $oXPath->query("/itop_design/classes//class/fields/field[@xsi:type='AttributeImage']");
foreach ($oNodeList as $oNode)
{
$this->LogWarning('The attribute '.self::GetItopNodePath($oNode).' is irrelevant and must be removed.');
$this->DeleteNode($oNode);
}
// Discard _delta="if_exists"
//
$oNodeList = $oXPath->query("//*[@_delta='if_exists']");