FIX: Stop ManyManyThroughList join records incorrectly showing as cha…

…nged (fixes #10821)
silverstripe · Aug 23, 2023 · 1fd4954 · 1fd4954
1 parent 4f6ab33
commit 1fd4954
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/src/ORM/ManyManyThroughList.php b/src/ORM/ManyManyThroughList.php
@@ -87,7 +87,8 @@ public function createDataObject($row)
         if ($joinRow) {
             $joinClass = $this->manipulator->getJoinClass();
             $joinQueryParams = $this->manipulator->extractInheritableQueryParameters($this->dataQuery);
-            $joinRecord = Injector::inst()->create($joinClass, $joinRow, false, $joinQueryParams);
+            $creationType = empty($joinRow['ID']) ? DataObject::CREATE_OBJECT : DataObject::CREATE_HYDRATED;
+            $joinRecord = Injector::inst()->create($joinClass, $joinRow, $creationType, $joinQueryParams);
             $record->setJoin($joinRecord, $joinAlias);
         }
 

diff --git a/tests/php/ORM/ManyManyThroughListTest.php b/tests/php/ORM/ManyManyThroughListTest.php
@@ -514,4 +514,19 @@ public function testRemoveCallbackOnRemoveAll()
         $relation->removeAll();
         $this->assertEquals(sort($remove), sort($removedIds));
     }
+
+    public function testChangedFields()
+    {
+        /** @var ManyManyThroughListTest\TestObject $parent */
+        $parent = $this->objFromFixture(ManyManyThroughListTest\TestObject::class, 'parent1');
+        $item1 = $parent->Items()->first();
+
+        // Nothing has changed yet
+        $this->assertEmpty($item1->getChangedFields());
+        $this->assertFalse($item1->isChanged('Title'));
+
+        // Change a field, ensure change is flagged
+        $item1->Title = 'a test title';
+        $this->assertTrue($item1->isChanged('Title'));
+    }
 }