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

XML customizations: fixed regression introduced in [r4075] (2.3.0-beta), could not change the parent of a class (which should move the class into the internal hierarchy)

Browse Source 
+ fixed two error messages

SVN:trunk[4194]
This commit is contained in:
Romain Quetiez
2016-06-10 12:43:53 +00:00
parent e8fb1cf236
commit 2a62b43848
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -423,7 +423,7 @@ class ModelFactory
{
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");
throw new Exception(MFDocument::GetItopNodePath($oSourceNode).' at line '.$oSourceNode->getLineNo().": could not be found");
}
}
else
@@ -435,6 +435,7 @@ class ModelFactory
$oTargetParentNode = $oTarget->GetNodeById('/itop_design/classes//class', $sParentId)->item(0);
$oTargetNode->Delete();
$oSourceNode->setAttribute('_delta', 'define');
$sDeltaSpec = 'define';
}
}
@@ -1908,7 +1909,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 B");
throw new Exception(MFDocument::GetItopNodePath($this).' at line '.$this->getLineNo().": could not be found");
}
if (!$bIfExists)
{