tonyair/silverstripe-gridfieldextensions
1
0
Fork 0
mirror of https://github.com/symbiote/silverstripe-gridfieldextensions.git synced 2024-10-22 17:05:39 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '3.6' into 3

Browse Source
This commit is contained in:
Guy Sartorelli 2023-08-30 10:18:58 +12:00
commit 9c70b0175b
No known key found for this signature in database
GPG Key ID: F313E3B9504D496A
10 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/lang/en.js
View File

@ -6,8 +6,8 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
} }
} else { } else {
ss.i18n.addDictionary('en', { ss.i18n.addDictionary('en', {
"GridFieldExtensions.CONFIRMDEL": "Are you sure you want to delete this?",
"GridFieldExtensions.ADD_CLASS": "Add: <i>{classname}</i>", "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.OPEN_SEARCH_FILTER": "Open search and filter",
"GridFieldExtensions.SAVE_PUBLISH": "Save & publish" "GridFieldExtensions.SAVE_PUBLISH": "Save & publish"
}); });

2
client/lang/eo.js
View File

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

2
client/lang/nl_NL.js
View File

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

2
client/lang/sl.js
View File

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

2
client/lang/src/en.json
View File

@ -1,6 +1,6 @@
{ {
"GridFieldExtensions.CONFIRMDEL": "Are you sure you want to delete this?",
"GridFieldExtensions.ADD_CLASS": "Add: <i>{classname}</i>", "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.OPEN_SEARCH_FILTER": "Open search and filter",
"GridFieldExtensions.SAVE_PUBLISH": "Save & publish" "GridFieldExtensions.SAVE_PUBLISH": "Save & publish"
} }

2
client/lang/src/eo.json
View File

@ -1,6 +1,6 @@
{ {
"GridFieldExtensions.CONFIRMDEL": "Ĉu vi certas ke vi volas forigi tion?",
"GridFieldExtensions.ADD_CLASS": "Aldoni: <i>{classname}</i>", "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.OPEN_SEARCH_FILTER": "Malfermi serĉon kaj filtrilon",
"GridFieldExtensions.SAVE_PUBLISH": "Konservi kaj publikigi" "GridFieldExtensions.SAVE_PUBLISH": "Konservi kaj publikigi"
} }

2
client/lang/src/nl_NL.json
View File

@ -1,6 +1,6 @@
{ {
"GridFieldExtensions.CONFIRMDEL": "Weet je zeker dat je dit wil verwijderen?",
"GridFieldExtensions.ADD_CLASS": "Toevoegen: <i>{classname}</i>", "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.OPEN_SEARCH_FILTER": "Open zoeken en filteren",
"GridFieldExtensions.SAVE_PUBLISH": "Opslaan & Publiceren" "GridFieldExtensions.SAVE_PUBLISH": "Opslaan & Publiceren"
} }

2
client/lang/src/sl.json
View File

@ -1,6 +1,6 @@
{ {
"GridFieldExtensions.CONFIRMDEL": "Res želite to izbrisati?",
"GridFieldExtensions.ADD_CLASS": "Dodaj: <i>{classname}</i>", "GridFieldExtensions.ADD_CLASS": "Dodaj: <i>{classname}</i>",
"GridFieldExtensions.CONFIRMDEL": "Res želite to izbrisati?",
"GridFieldExtensions.OPEN_SEARCH_FILTER": "Prikaži iskalnik in filtre", "GridFieldExtensions.OPEN_SEARCH_FILTER": "Prikaži iskalnik in filtre",
"GridFieldExtensions.SAVE_PUBLISH": "Shrani in objavi" "GridFieldExtensions.SAVE_PUBLISH": "Shrani in objavi"
} }

4
lang/nl_NL.yml
View File

@ -5,14 +5,14 @@ nl_NL:
GridFieldExtensions: GridFieldExtensions:
ADD: Toevoegen ADD: Toevoegen
ADDEXISTING: 'Bestaande toevoegen' ADDEXISTING: 'Bestaande toevoegen'
SEARCH: Zoeken
SELECTTYPETOCREATE: '(Selecteer type om te creeën)'
BACK: Terug BACK: Terug
CURRENT: (huidige) CURRENT: (huidige)
NOITEMS: 'Er zijn geen items.' NOITEMS: 'Er zijn geen items.'
Next: Volgende Next: Volgende
PREVIOUS: Vorige PREVIOUS: Vorige
RESULTS: Resultaten RESULTS: Resultaten
SEARCH: Zoeken
SELECTTYPETOCREATE: '(Selecteer type om te creeën)'
Symbiote\GridFieldExtensions\Extensions\GridFieldDetailFormItemRequestExtension: Symbiote\GridFieldExtensions\Extensions\GridFieldDetailFormItemRequestExtension:
NEW: 'Nieuw item maken' NEW: 'Nieuw item maken'
Symbiote\GridFieldExtensions\GridFieldConfigurablePaginator: Symbiote\GridFieldExtensions\GridFieldConfigurablePaginator:

5
src/GridFieldEditableColumns.php
View File

@ -24,6 +24,7 @@ use SilverStripe\ORM\DataList;
use SilverStripe\ORM\DataObject; use SilverStripe\ORM\DataObject;
use SilverStripe\ORM\DataObjectInterface; use SilverStripe\ORM\DataObjectInterface;
use SilverStripe\ORM\ManyManyList; use SilverStripe\ORM\ManyManyList;
use SilverStripe\ORM\ManyManyThroughList;
/** /**
* Allows inline editing of grid field records without having to load a separate * Allows inline editing of grid field records without having to load a separate
@ -165,7 +166,7 @@ class GridFieldEditableColumns extends GridFieldDataColumns implements
} }
} }
if ($list instanceof ManyManyList) { if ($list instanceof ManyManyList || $list instanceof ManyManyThroughList) {
$extra = array_intersect_key($form->getData() ?? [], (array) $list->getExtraFields()); $extra = array_intersect_key($form->getData() ?? [], (array) $list->getExtraFields());
} }
@ -250,7 +251,7 @@ class GridFieldEditableColumns extends GridFieldDataColumns implements
} }
} }
if (!$field && $list instanceof ManyManyList) { if (!$field && ($list instanceof ManyManyList || $list instanceof ManyManyThroughList)) {
$extra = $list->getExtraFields(); $extra = $list->getExtraFields();
if ($extra && array_key_exists($col, $extra ?? [])) { if ($extra && array_key_exists($col, $extra ?? [])) {