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

Compiler and co: fixed issue on delta load (delete then merge a node)

Browse Source 
SVN:trunk[1964]
This commit is contained in:
Romain Quetiez
2012-04-19 14:37:41 +00:00
parent 65e55e0927
commit 2f4cbcac25
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
setup/modelfactory.class.inc.php
View File

@@ -1652,7 +1652,19 @@ class MFElement extends DOMElement
public function MergeInto($oContainer, $sSearchId, $bMustExist)
{
$oTargetNode = $oContainer->FindExistingChildNode($this, $sSearchId);
if (!$oTargetNode)
if ($oTargetNode)
{
if ($oTargetNode->getAttribute('_alteration') == 'removed')
{
if ($bMustExist)
{
throw new Exception("XML datamodel loader: found mandatory node $this->tagName/$sSearchId marked as deleted in $oContainer->tagName");
}
$oTargetNode = $oContainer->ownerDocument->ImportNode($this, false);
$oContainer->AddChildNode($oTargetNode);
}
}
else
{
if ($bMustExist)
{