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

N°6870 - Community re-integration support

Browse Source
This commit is contained in:
Eric Espie
2023-10-25 14:30:16 +02:00
parent 50f5ab6be4
commit 44e826543d
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1466,7 +1466,7 @@ EOF
switch ($sAlteration) {
case '':
if ($oNodeClone->hasAttribute('id')) {
$oNodeClone->setAttribute('_delta', 'merge');
//$oNodeClone->setAttribute('_delta', 'merge');
}
break;
case 'added':

4
tests/php-unit-tests/unitary-tests/setup/ModelFactoryTest.php
View File

@@ -1373,7 +1373,7 @@ XML
'sExpectedXMLDelta' => <<<XML
<?xml version="1.0" encoding="UTF-8"?>
<root_node>
<james_bond id="Sean" _rename_from="Roger" _delta="merge"/>
<james_bond id="Sean" _rename_from="Roger"/>
</root_node>
XML
],
@@ -1389,7 +1389,7 @@ XML
'sExpectedXMLDelta' => <<<XML
<?xml version="1.0" encoding="UTF-8"?>
<root_node>
<james_bond id="Sean" _rename_from="Roger" _delta="merge">
<james_bond id="Sean" _rename_from="Roger">
<subtree _delta="define">etc.</subtree>
</james_bond>
</root_node>