Selaa lähdekoodia

ModelFactory: needed / define_if_not_exists were not equivalent

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@2850 a333f486-631f-4898-b8df-5754b55c2be0
romainq 11 vuotta sitten
vanhempi
commit
27c009a90f
1 muutettua tiedostoa jossa 4 lisäystä ja 0 poistoa
  1. 4 0
      setup/modelfactory.class.inc.php

+ 4 - 0
setup/modelfactory.class.inc.php

@@ -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;