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

Model factory: _delta = if_exists, not working with <class> nodes

Browse Source 
SVN:trunk[4102]
This commit is contained in:
Romain Quetiez
2016-05-18 08:22:17 +00:00
parent c914344a32
commit 70774f1923
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -415,9 +415,16 @@ class ModelFactory
$oTargetNode = $oTarget->GetNodeById('/itop_design/classes//class', $oSourceNode->getAttribute('id'))->item(0);
if (!$oTargetNode)
{
echo "Dumping target doc - looking for '".$oSourceNode->getAttribute('id')."'<br/>\n";
$this->oDOMDocument->firstChild->Dump();
throw new Exception(MFDocument::GetItopNodePath($oSourceNode).' at line '.$oSourceNode->getLineNo().": could not be found");
if ($sDeltaSpec === 'if_exists')
{
// Just ignore it
}
else
{
echo "Dumping target doc - looking for '".$oSourceNode->getAttribute('id')."'<br/>\n";
$this->oDOMDocument->firstChild->Dump();
throw new Exception(MFDocument::GetItopNodePath($oSourceNode).' at line '.$oSourceNode->getLineNo().": could not be found A");
}
}
else
{
@@ -1901,7 +1908,7 @@ class MFElement extends Combodo\iTop\DesignElement
{
echo "Dumping parent node<br/>\n";
$oContainer->Dump();
throw new Exception(MFDocument::GetItopNodePath($this).' at line '.$this->getLineNo().": could not be found");
throw new Exception(MFDocument::GetItopNodePath($this).' at line '.$this->getLineNo().": could not be found B");
}
if (!$bIfExists)
{