Merge pull request #372 from creative-commoners/pulls/3.6/manymanythrough-editablecolumns

lozcalver · web-flow · commit e7d717871935 · 2023-08-21T09:06:49.000+01:00
FIX Allow editing extra fields from ManyManyThroughList.
diff --git a/src/GridFieldEditableColumns.php b/src/GridFieldEditableColumns.php
@@ -24,6 +24,7 @@
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\DataObjectInterface;
 use SilverStripe\ORM\ManyManyList;
+use SilverStripe\ORM\ManyManyThroughList;
 
 /**
  * Allows inline editing of grid field records without having to load a separate
@@ -165,7 +166,7 @@ public function handleSave(GridField $grid, DataObjectInterface $record)
                 }
             }
 
-            if ($list instanceof ManyManyList) {
+            if ($list instanceof ManyManyList || $list instanceof ManyManyThroughList) {
                 $extra = array_intersect_key($form->getData() ?? [], (array) $list->getExtraFields());
             }
 
@@ -250,7 +251,7 @@ public function getFields(GridField $grid, DataObjectInterface $record)
                 }
             }
 
-            if (!$field && $list instanceof ManyManyList) {
+            if (!$field && ($list instanceof ManyManyList || $list instanceof ManyManyThroughList)) {
                 $extra = $list->getExtraFields();
 
                 if ($extra && array_key_exists($col, $extra ?? [])) {

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@`
`24`	`24`	`use SilverStripe\ORM\DataObject;`
`25`	`25`	`use SilverStripe\ORM\DataObjectInterface;`
`26`	`26`	`use SilverStripe\ORM\ManyManyList;`
	`27`	`+use SilverStripe\ORM\ManyManyThroughList;`
`27`	`28`
`28`	`29`	`/**`
`29`	`30`	`* Allows inline editing of grid field records without having to load a separate`
`@@ -165,7 +166,7 @@ public function handleSave(GridField $grid, DataObjectInterface $record)`
`165`	`166`	`}`
`166`	`167`	`}`
`167`	`168`
`168`		`- if ($list instanceof ManyManyList) {`
	`169`	`+ if ($list instanceof ManyManyList \|\| $list instanceof ManyManyThroughList) {`
`169`	`170`	`$extra = array_intersect_key($form->getData() ?? [], (array) $list->getExtraFields());`
`170`	`171`	`}`
`171`	`172`
`@@ -250,7 +251,7 @@ public function getFields(GridField $grid, DataObjectInterface $record)`
`250`	`251`	`}`
`251`	`252`	`}`
`252`	`253`
`253`		`- if (!$field && $list instanceof ManyManyList) {`
	`254`	`+ if (!$field && ($list instanceof ManyManyList \|\| $list instanceof ManyManyThroughList)) {`
`254`	`255`	`$extra = $list->getExtraFields();`
`255`	`256`
`256`	`257`	`if ($extra && array_key_exists($col, $extra ?? [])) {`