opensource/filament
3
0
Fork 0
mirror of https://github.com/filamentphp/filament.git synced 2026-10-28 03:44:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge pull request #12372 from dmitry-udod/3.x"

Browse Source 
This reverts commit 84e07b3e39, reversing
changes made to 46ce51ab45.
This commit is contained in:
Dan Harrin
2024-04-21 23:04:45 +01:00
parent 3ce6455791
commit eb918c1096
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/spatie-laravel-translatable-plugin/src/Resources/Pages/EditRecord/Concerns/Translatable.php
+2 -2
View File
@@ -91,10 +91,10 @@ trait Translatable
$this->otherLocaleData[$this->oldActiveLocale] = Arr::only($this->data, $translatableAttributes);
$this->form->fill([
$this->data = [
...Arr::except($this->data, $translatableAttributes),
...$this->otherLocaleData[$this->activeLocale] ?? [],
]);
];
unset($this->otherLocaleData[$this->activeLocale]);
}
packages/spatie-laravel-translatable-plugin/src/Resources/Pages/ViewRecord/Concerns/Translatable.php
+2 -3
View File
@@ -29,11 +29,10 @@ trait Translatable
$translatableAttributes = static::getResource()::getTranslatableAttributes();
$this->otherLocaleData[$this->oldActiveLocale] = Arr::only($this->data, $translatableAttributes);
$this->form->fill([
$this->data = [
...$this->data,
...$this->otherLocaleData[$this->activeLocale] ?? [],
]);
];
}
public function getTranslatableLocales(): array