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

ModelFactory: needed / define_if_not_exists were not equivalent

Browse Source 
SVN:trunk[2850]
This commit is contained in:
Romain Quetiez
2013-09-12 08:09:15 +00:00
parent ccc9729cc5
commit 0bced2f9ae
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -325,6 +325,7 @@ class ModelFactory
{
$oTargetNode = $oExistingNode;
}
$oTargetNode->setAttribute('_alteration', 'needed');
break;
case 'define':
@@ -1150,6 +1151,7 @@ EOF
{
case 'added':
case 'replaced':
case 'needed':
// marked as added or modified, just reset the flag
$oNode->removeAttribute('_alteration');
break;
@@ -1924,6 +1926,7 @@ class MFElement extends DOMElement
$sFlag = 'removed';
break;
case 'added':
case 'needed':
$sFlag = null;
break;
case 'removed':
@@ -2069,6 +2072,7 @@ class MFElement extends DOMElement
{
case 'added':
case 'replaced':
case 'needed':
// marked as added or modified, just reset the flag
$oNode->removeAttribute('_alteration');
break;