composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-12 23:14:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/support/3.1' into support/3.2

Browse Source
This commit is contained in:
Molkobain
2024-03-22 14:23:00 +01:00
parent 5d8a0f8e9f 90458f6048
commit babdd9f163
3 changed files with 201 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -832,6 +832,7 @@ class ModelFactory
case '':
$bMustExist = ($sDeltaSpec === 'must_exist');
$bIfExists = ($sDeltaSpec === 'if_exists');
$bSpecifiedMerge = $oSourceNode->IsInSpecifiedMerge();
/** @var MFElement $oTargetNode */
$oTargetNode = $oTargetParentNode->_FindChildNode($oSourceNode, $sSearchId);
@@ -847,7 +848,7 @@ class ModelFactory
// Do not continue deeper
$oTargetNode = null;
} else {
if ($sMode === self::LOAD_DELTA_MODE_STRICT && ($sSearchId !== '' || is_null($oSourceNode->firstElementChild))) {
if (!$bSpecifiedMerge && $sMode === self::LOAD_DELTA_MODE_STRICT && ($sSearchId !== '' || is_null($oSourceNode->firstElementChild))) {
$iLine = ModelFactory::GetXMLLineNumber($oSourceNode);
$sItopNodePath = DesignDocument::GetItopNodePath($oSourceNode);
throw new MFException($sItopNodePath.' at line '.$iLine.': could not be found or marked as removed (strict mode)',
@@ -867,12 +868,15 @@ class ModelFactory
// Do not continue deeper everything is already copied
$oTargetNode = null;
} else {
// copy the node with attributes and continue deeper
// copy the node with attributes (except _delta) and continue deeper
$oTargetNode = $oTargetDocument->importNode($oSourceNode, false);
foreach ($oSourceNode->attributes as $oAttributeNode) {
$oTargetNode->setAttribute($oAttributeNode->name, $oAttributeNode->value);
}
if ($sSearchId !== '') {
if ($oTargetNode->hasAttribute('_delta')) {
$oTargetNode->removeAttribute('_delta');
}
if ($sSearchId !== '' || $bSpecifiedMerge) {
// Add the node by default
$oTargetParentNode->AddChildNode($oTargetNode);
} else {