Merge branch '3.6' into 3

symbiote · Aug 29, 2023 · 9c70b01 · 9c70b01
2 parents a2ea473 + e7d7178
commit 9c70b01
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 12 deletions.
diff --git a/client/lang/en.js b/client/lang/en.js
@@ -6,8 +6,8 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
   }
 } else {
   ss.i18n.addDictionary('en', {
-    "GridFieldExtensions.CONFIRMDEL": "Are you sure you want to delete this?",
     "GridFieldExtensions.ADD_CLASS": "Add: <i>{classname}</i>",
+    "GridFieldExtensions.CONFIRMDEL": "Are you sure you want to delete this?",
     "GridFieldExtensions.OPEN_SEARCH_FILTER": "Open search and filter",
     "GridFieldExtensions.SAVE_PUBLISH": "Save & publish"
 });

diff --git a/client/lang/eo.js b/client/lang/eo.js
@@ -6,8 +6,8 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
   }
 } else {
   ss.i18n.addDictionary('eo', {
-    "GridFieldExtensions.CONFIRMDEL": "Ĉu vi certas ke vi volas forigi tion?",
     "GridFieldExtensions.ADD_CLASS": "Aldoni: <i>{classname}</i>",
+    "GridFieldExtensions.CONFIRMDEL": "Ĉu vi certas ke vi volas forigi tion?",
     "GridFieldExtensions.OPEN_SEARCH_FILTER": "Malfermi serĉon kaj filtrilon",
     "GridFieldExtensions.SAVE_PUBLISH": "Konservi kaj publikigi"
 });

diff --git a/client/lang/nl_NL.js b/client/lang/nl_NL.js
@@ -6,8 +6,8 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
   }
 } else {
   ss.i18n.addDictionary('nl_NL', {
-    "GridFieldExtensions.CONFIRMDEL": "Weet je zeker dat je dit wil verwijderen?",
     "GridFieldExtensions.ADD_CLASS": "Toevoegen: <i>{classname}</i>",
+    "GridFieldExtensions.CONFIRMDEL": "Weet je zeker dat je dit wil verwijderen?",
     "GridFieldExtensions.OPEN_SEARCH_FILTER": "Open zoeken en filteren",
     "GridFieldExtensions.SAVE_PUBLISH": "Opslaan & Publiceren"
 });

diff --git a/client/lang/sl.js b/client/lang/sl.js
@@ -6,8 +6,8 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
   }
 } else {
   ss.i18n.addDictionary('sl', {
-    "GridFieldExtensions.CONFIRMDEL": "Res želite to izbrisati?",
     "GridFieldExtensions.ADD_CLASS": "Dodaj: <i>{classname}</i>",
+    "GridFieldExtensions.CONFIRMDEL": "Res želite to izbrisati?",
     "GridFieldExtensions.OPEN_SEARCH_FILTER": "Prikaži iskalnik in filtre",
     "GridFieldExtensions.SAVE_PUBLISH": "Shrani in objavi"
 });

diff --git a/client/lang/src/en.json b/client/lang/src/en.json
@@ -1,6 +1,6 @@
 {
-    "GridFieldExtensions.CONFIRMDEL": "Are you sure you want to delete this?",
     "GridFieldExtensions.ADD_CLASS": "Add: <i>{classname}</i>",
+    "GridFieldExtensions.CONFIRMDEL": "Are you sure you want to delete this?",
     "GridFieldExtensions.OPEN_SEARCH_FILTER": "Open search and filter",
     "GridFieldExtensions.SAVE_PUBLISH": "Save & publish"
 }
diff --git a/client/lang/src/eo.json b/client/lang/src/eo.json
@@ -1,6 +1,6 @@
 {
-    "GridFieldExtensions.CONFIRMDEL": "Ĉu vi certas ke vi volas forigi tion?",
     "GridFieldExtensions.ADD_CLASS": "Aldoni: <i>{classname}</i>",
+    "GridFieldExtensions.CONFIRMDEL": "Ĉu vi certas ke vi volas forigi tion?",
     "GridFieldExtensions.OPEN_SEARCH_FILTER": "Malfermi serĉon kaj filtrilon",
     "GridFieldExtensions.SAVE_PUBLISH": "Konservi kaj publikigi"
 }
diff --git a/client/lang/src/nl_NL.json b/client/lang/src/nl_NL.json
@@ -1,6 +1,6 @@
 {
-    "GridFieldExtensions.CONFIRMDEL": "Weet je zeker dat je dit wil verwijderen?",
     "GridFieldExtensions.ADD_CLASS": "Toevoegen: <i>{classname}</i>",
+    "GridFieldExtensions.CONFIRMDEL": "Weet je zeker dat je dit wil verwijderen?",
     "GridFieldExtensions.OPEN_SEARCH_FILTER": "Open zoeken en filteren",
     "GridFieldExtensions.SAVE_PUBLISH": "Opslaan & Publiceren"
 }
diff --git a/client/lang/src/sl.json b/client/lang/src/sl.json
@@ -1,6 +1,6 @@
 {
-    "GridFieldExtensions.CONFIRMDEL": "Res želite to izbrisati?",
     "GridFieldExtensions.ADD_CLASS": "Dodaj: <i>{classname}</i>",
+    "GridFieldExtensions.CONFIRMDEL": "Res želite to izbrisati?",
     "GridFieldExtensions.OPEN_SEARCH_FILTER": "Prikaži iskalnik in filtre",
     "GridFieldExtensions.SAVE_PUBLISH": "Shrani in objavi"
 }
diff --git a/lang/nl_NL.yml b/lang/nl_NL.yml
@@ -5,14 +5,14 @@ nl_NL:
   GridFieldExtensions:
     ADD: Toevoegen
     ADDEXISTING: 'Bestaande toevoegen'
-    SEARCH: Zoeken
-    SELECTTYPETOCREATE: '(Selecteer type om te creeën)'
     BACK: Terug
     CURRENT: (huidige)
     NOITEMS: 'Er zijn geen items.'
     Next: Volgende
     PREVIOUS: Vorige
     RESULTS: Resultaten
+    SEARCH: Zoeken
+    SELECTTYPETOCREATE: '(Selecteer type om te creeën)'
   Symbiote\GridFieldExtensions\Extensions\GridFieldDetailFormItemRequestExtension:
     NEW: 'Nieuw item maken'
   Symbiote\GridFieldExtensions\GridFieldConfigurablePaginator:

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 ?? [])) {