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

Community integration: changed default behaviour for datamodel XML nodes without _delta from 'must_exist' to 'merge'

Browse Source
This commit is contained in:
Eric Espie
2023-10-25 10:05:46 +02:00
parent a9bd62dc43
commit 941412a365
2 changed files with 51 additions and 1 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', 'must_exist');
$oNodeClone->setAttribute('_delta', 'merge');
}
break;
case 'added':

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

@@ -678,6 +678,56 @@ XML
<nodeA>
<nodeB>Luke Banner</nodeB>
</nodeA>
XML
];
$aDeltas['_delta="define_and_must_exits"'] = [
'sInitialXML' => <<<XML
<nodeA>
</nodeA>
XML
,
'sDeltaXML' => <<<XML
<nodeA>
<nodeB id="Banner" _delta="define"/>
<nodeB id="Banner" _delta="must_exist">
<nodeC _delta="define"/>
</nodeB>
</nodeA>
XML
,
'sExpectedXML' => <<<XML
<nodeA>
<nodeB id="Banner">
<nodeC/>
</nodeB>
</nodeA>
XML
];
$aDeltas['_delta="define_and_must_exits_fails"'] = [
'sInitialXML' => <<<XML
<nodeA>
</nodeA>
XML
,
'sDeltaXML' => <<<XML
<nodeA>
<nodeB id="Banner" _delta="define">
<nodeE/>
</nodeB>
<nodeB id="Banner" _delta="must_exist">
<nodeC _delta="define_if_not_exists">
<nodeD id="Bruce" _delta="define"/>
</nodeC>
</nodeB>
</nodeA>
XML
,
'sExpectedXML' => <<<XML
<nodeA>
<nodeB id="Banner">
<nodeC/>
</nodeB>
</nodeA>
XML
];