Skip to content

Commit

Permalink
Merge branch '4' into 5
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions[bot] committed Aug 7, 2024
2 parents 23fa6cd + 27eccda commit 166f71a
Show file tree
Hide file tree
Showing 5 changed files with 50 additions and 11 deletions.
14 changes: 14 additions & 0 deletions client/lang/de.js
Original file line number Diff line number Diff line change
@@ -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 changes: 6 additions & 0 deletions client/lang/src/de.json
Original file line number Diff line number Diff line change
@@ -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 changes: 17 additions & 0 deletions lang/de.yml
Original file line number Diff line number Diff line change
@@ -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.'
2 changes: 2 additions & 0 deletions lang/eo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,5 @@ eo:
NEW: 'Aldoni novan rikordon'
Symbiote\GridFieldExtensions\GridFieldConfigurablePaginator:
SHOW: Vidigi
Symbiote\GridFieldExtensions\GridFieldOrderableRows:
REORDERED: 'Reordigis rikordojn.'
22 changes: 11 additions & 11 deletions src/GridFieldNestedForm.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand All @@ -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;
Expand All @@ -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
*/
Expand All @@ -95,7 +95,7 @@ public function getRelationName(): string
{
return $this->relationName;
}

/**
* Set the relation name to use for the nested grid fields
*/
Expand All @@ -121,7 +121,7 @@ public function setInlineEditable(bool $editable): static
$this->inlineEditable = $editable;
return $this;
}

/**
* Set whether the nested grid fields should be expanded by default
*/
Expand Down Expand Up @@ -255,7 +255,7 @@ public function getColumnContent($gridField, $record, $columnName)
])->renderWith('Symbiote\GridFieldExtensions\GridFieldNestedForm');
}
}

public function getURLHandlers($gridField)
{
return [
Expand Down Expand Up @@ -349,7 +349,7 @@ public function handleMoveToParent(GridField $gridField, $request): string
}
return $gridField->FieldHolder();
}

/**
* Handle the request to show a nested item
*/
Expand Down Expand Up @@ -424,7 +424,7 @@ public function toggleNestedItem(
$stateRelation = $className.'-'.$record->ID.'-'.$this->getRelationName();
$state->$stateRelation = (int)$request->getVar('toggle');
}

/**
* Get the link for the nested grid field
*/
Expand All @@ -444,10 +444,10 @@ public function ToggleLink($action = null): string
$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
Expand Down

0 comments on commit 166f71a

Please sign in to comment.