BUGFIX Setting level in DataObject->getChangedFields() to 'value chan…

…ge' rather than 'type change' for CompositeFields, so they save correctly (fixes #6726, thanks frankmullenger)
silverstripe · Oct 7, 2011 · c630f83 · c630f83
1 parent dcf5995
commit c630f83
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/model/DataObject.php b/model/DataObject.php
@@ -1979,7 +1979,7 @@ public function getChangedFields($databaseFieldsOnly = false, $changeLevel = 1)
 		// Update the changed array with references to changed obj-fields
 		foreach($this->record as $k => $v) {
 			if(is_object($v) && method_exists($v, 'isChanged') && $v->isChanged()) {
-				$this->changed[$k] = 1;
+				$this->changed[$k] = 2;
 			}
 		}
 

diff --git a/tests/model/MoneyTest.php b/tests/model/MoneyTest.php
@@ -45,7 +45,8 @@ function testDataObjectChangedFields() {
 		$this->assertType('Money', $obj->MyMoney);
 		$obj->MyMoney->setAmount(99);
 		$changed = $obj->getChangedFields();
-		$this->assertContains('MyMoney', array_keys($changed));
+		$this->assertContains('MyMoney', array_keys($changed), 'Field is detected as changed');
+		$this->assertEquals(2, $changed['MyMoney']['level'], 'Correct change level');
 	}
 
 	function testCanOverwriteSettersWithNull() {