Merge branch '4' into 5

This commit is contained in:
github-actions 2024-08-07 04:50:39 +00:00
commit 166f71a4aa
5 changed files with 50 additions and 11 deletions

14
client/lang/de.js Normal file
View File

@ -0,0 +1,14 @@
// This file was generated by silverstripe/tx-translator from client/lang/src/de.json.
// See https://github.com/silverstripe/silverstripe-tx-translator for details
if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
if (typeof(console) !== 'undefined') { // eslint-disable-line no-console
console.error('Class ss.i18n not defined'); // eslint-disable-line no-console
}
} else {
ss.i18n.addDictionary('de', {
"GridFieldExtensions.ADD_CLASS": "{classname} hinzufügen",
"GridFieldExtensions.CONFIRMDEL": "Sind Sie sicher, dass Sie das löschen wollen?",
"GridFieldExtensions.OPEN_SEARCH_FILTER": "Suche und Filter öffnen",
"GridFieldExtensions.SAVE_PUBLISH": "Speichern und Veröffentlichen"
});
}

6
client/lang/src/de.json Normal file
View File

@ -0,0 +1,6 @@
{
"GridFieldExtensions.ADD_CLASS": "{classname} hinzufügen",
"GridFieldExtensions.CONFIRMDEL": "Sind Sie sicher, dass Sie das löschen wollen?",
"GridFieldExtensions.OPEN_SEARCH_FILTER": "Suche und Filter öffnen",
"GridFieldExtensions.SAVE_PUBLISH": "Speichern und Veröffentlichen"
}

17
lang/de.yml Normal file
View File

@ -0,0 +1,17 @@
de:
GridFieldExtensions:
ADD: Hinzufügen
ADDEXISTING: 'Bestehenden Eintrag hinzufügen'
BACK: Zurück
CURRENT: (aktuell)
Next: Nächste
PREVIOUS: Vorherige
RESULTS: Ergebnisse
SEARCH: Suche
SELECTTYPETOCREATE: '(Bitte Typ auswählen)'
Symbiote\GridFieldExtensions\Extensions\GridFieldDetailFormItemRequestExtension:
NEW: 'Neuen Eintrag hinzufügen'
Symbiote\GridFieldExtensions\GridFieldConfigurablePaginator:
SHOW: Anzeigen
Symbiote\GridFieldExtensions\GridFieldOrderableRows:
REORDERED: 'Einträge neu sortiert.'

View File

@ -14,3 +14,5 @@ eo:
NEW: 'Aldoni novan rikordon'
Symbiote\GridFieldExtensions\GridFieldConfigurablePaginator:
SHOW: Vidigi
Symbiote\GridFieldExtensions\GridFieldOrderableRows:
REORDERED: 'Reordigis rikordojn.'

View File

@ -41,7 +41,7 @@ class GridFieldNestedForm extends AbstractGridFieldComponent implements
GridField_DataManipulator
{
use Configurable, GridFieldStateAware;
/**
* The key used in the post data to identify nested form data
*/
@ -55,7 +55,7 @@ class GridFieldNestedForm extends AbstractGridFieldComponent implements
* The default max nesting level. Nesting further than this will throw an exception.
*/
private static int $default_max_nesting_level = 10;
private string $name;
private bool $expandNested = false;
@ -74,12 +74,12 @@ class GridFieldNestedForm extends AbstractGridFieldComponent implements
private $canExpandCallback = null;
private int $maxNestingLevel = 0;
public function __construct($name = 'NestedForm')
{
$this->name = $name;
}
/**
* Get the grid field that this component is attached to
*/
@ -95,7 +95,7 @@ class GridFieldNestedForm extends AbstractGridFieldComponent implements
{
return $this->relationName;
}
/**
* Set the relation name to use for the nested grid fields
*/
@ -121,7 +121,7 @@ class GridFieldNestedForm extends AbstractGridFieldComponent implements
$this->inlineEditable = $editable;
return $this;
}
/**
* Set whether the nested grid fields should be expanded by default
*/
@ -255,7 +255,7 @@ class GridFieldNestedForm extends AbstractGridFieldComponent implements
])->renderWith('Symbiote\GridFieldExtensions\GridFieldNestedForm');
}
}
public function getURLHandlers($gridField)
{
return [
@ -349,7 +349,7 @@ class GridFieldNestedForm extends AbstractGridFieldComponent implements
}
return $gridField->FieldHolder();
}
/**
* Handle the request to show a nested item
*/
@ -424,7 +424,7 @@ class GridFieldNestedForm extends AbstractGridFieldComponent implements
$stateRelation = $className.'-'.$record->ID.'-'.$this->getRelationName();
$state->$stateRelation = (int)$request->getVar('toggle');
}
/**
* Get the link for the nested grid field
*/
@ -444,10 +444,10 @@ class GridFieldNestedForm extends AbstractGridFieldComponent implements
$manager = $this->getStateManager();
return $manager->addStateToURL($this->gridField, $link);
}
public function handleSave(GridField $gridField, DataObjectInterface $record)
{
$postKey = self::POST_KEY;
$postKey = GridFieldNestedForm::POST_KEY;
$value = $gridField->Value();
if (isset($value['GridState']) && $value['GridState']) {
// set grid state from value, to store open/closed toggle state for nested forms