Skip to content

Commit cc5c7da

Browse files
committed
fix: move applyFallbackLanguages from request body to per-column
1 parent 5036240 commit cc5c7da

4 files changed

Lines changed: 3 additions & 15 deletions

File tree

src/Grid/Attribute/Request/GridRequestBody.php

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,6 @@ public function __construct()
4646
ref: Filter::class,
4747
type: 'object'
4848
),
49-
new Property(
50-
property: 'applyFallbackLanguages',
51-
description: 'When true, empty localized values fall back to configured fallback languages',
52-
type: 'boolean',
53-
default: false
54-
),
5549
],
5650
type: 'object',
5751
),

src/Grid/MappedParameter/GridParameter.php

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ public function __construct(
2424
private int $folderId,
2525
private array $columns,
2626
private ?FilterParameter $filters,
27-
private bool $applyFallbackLanguages = false
2827
) {
2928
}
3029

@@ -42,9 +41,4 @@ public function getFilters(): FilterParameter
4241
{
4342
return $this->filters ?? new FilterParameter();
4443
}
45-
46-
public function getApplyFallbackLanguages(): bool
47-
{
48-
return $this->applyFallbackLanguages;
49-
}
5044
}

src/Grid/Schema/Column.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ public function __construct(
5454
),
5555
example: ['key' => 'value'])]
5656
private array $config,
57+
#[Property(description: 'When true, empty localized values fall back to configured fallback languages', type: 'boolean', default: false)]
5758
private bool $applyFallbackLanguages = false,
5859
) {
5960
}

src/Grid/Service/GridService.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,6 @@ private function appendLocale(string $key, Column $column): string
327327
*/
328328
private function getConfigurationFromArray(
329329
array $config,
330-
bool $applyFallbackLanguages = false
331330
): ColumnCollection {
332331

333332
$columns = [];
@@ -339,7 +338,7 @@ private function getConfigurationFromArray(
339338
type: $column['type'],
340339
group: $column['group'] ?? null,
341340
config: $column['config'],
342-
applyFallbackLanguages: $applyFallbackLanguages
341+
applyFallbackLanguages: $column['applyFallbackLanguages'] ?? false
343342
);
344343
} catch (Exception) {
345344
throw new InvalidArgumentException('Invalid column configuration');
@@ -417,7 +416,7 @@ private function getCollectionFromSearchResult(
417416
$data = [];
418417
foreach ($items as $item) {
419418
$data[] = $this->getGridDataForElement(
420-
$this->getConfigurationFromArray($gridParameter->getColumns(), $gridParameter->getApplyFallbackLanguages()),
419+
$this->getConfigurationFromArray($gridParameter->getColumns()),
421420
$item,
422421
$elementType,
423422
$item->getId()

0 commit comments

Comments
 (0)