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

N°3990 - Compiler: Set "_delta" flag on moved node if no ancestors has one

Browse Source
This commit is contained in:
Molkobain
2021-05-10 19:04:45 +02:00
parent ab30bae46a
commit 626316e8d1
21 changed files with 434 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -503,6 +503,17 @@ class MFDictModule extends MFModule
*/
class ModelFactory
{
/**
* @var array Values of the _delta flag meaning that a node is "in definition" = currently being added to the delta
* @since 3.0.0
*/
public const DELTA_FLAG_IN_DEFINITION_VALUES = ['define', 'define_if_not_exists', 'redefine', 'force'];
/**
* @var array Values of the _delta flag meaning that a node is "in deletion" = currently being removed from the delta
* @since 3.0.0
*/
public const DELTA_FLAG_IN_DELETION_VALUES = ['delete', 'delete_if_exists'];
protected $aRootDirs;
protected $oDOMDocument;
protected $oRoot;
@@ -682,8 +693,8 @@ class ModelFactory
}
}
switch ($sDeltaSpec)
{
// IMPORTANT: In case of a new flag value, mind to update the iTopDesignFormat methods
switch ($sDeltaSpec) {
case 'if_exists':
case 'must_exist':
case 'merge':
@@ -692,10 +703,8 @@ class ModelFactory
$bIfExists = ($sDeltaSpec == 'if_exists');
$sSearchId = $oSourceNode->hasAttribute('_rename_from') ? $oSourceNode->getAttribute('_rename_from') : $oSourceNode->getAttribute('id');
$oTargetNode = $oSourceNode->MergeInto($oTargetParentNode, $sSearchId, $bMustExist, $bIfExists);
if ($oTargetNode)
{
foreach ($oSourceNode->childNodes as $oSourceChild)
{
if ($oTargetNode) {
foreach ($oSourceNode->childNodes as $oSourceChild) {
// Continue deeper
$this->LoadDelta($oSourceChild, $oTargetNode);
}
@@ -1406,16 +1415,14 @@ EOF
{
$sAlteration = $oNodeClone->getAttribute('_alteration');
$oNodeClone->removeAttribute('_alteration');
if ($oNodeClone->hasAttribute('_old_id'))
{
if ($oNodeClone->hasAttribute('_old_id')) {
$oNodeClone->setAttribute('_rename_from', $oNodeClone->getAttribute('_old_id'));
$oNodeClone->removeAttribute('_old_id');
}
switch ($sAlteration)
{
// IMPORTANT: In case of a new flag value, mind to update the iTopDesignFormat methods
switch ($sAlteration) {
case '':
if ($oNodeClone->hasAttribute('id'))
{
if ($oNodeClone->hasAttribute('id')) {
$oNodeClone->setAttribute('_delta', 'must_exist');
}
break;