fill form with data from basemodel

Author: mooxbot

src/Entities/Items/Draft/Pages/BaseEditDraft.php

@@ -32,18 +32,18 @@ public function mount($record): void
     public function mutateFormDataBeforeFill(array $data): array
     {
         $record = $this->getRecord();
-    
+        $values = $data;
+
         if (! method_exists($record, 'getTranslation') || ! property_exists($record, 'translatedAttributes')) {
-            return $data;
+            return $values;
         }
-    
+
         $translatable = $record->translatedAttributes;
-        $values = [];
         foreach ($translatable as $attr) {
             $translation = $record->getTranslation($this->lang, false);
             $values[$attr] = $translation ? $translation->$attr : $record->$attr;
         }
-    
+
         return $values;
     }
 

src/Entities/Items/Draft/Pages/BaseViewDraft.php

@@ -26,16 +26,14 @@ public function mount($record): void
     public function mutateFormDataBeforeFill(array $data): array
     {
         $record = $this->getRecord();
+        $values = $data;
 
-        if (! method_exists($record, 'getTranslation') || ! property_exists($record, 'translatedAttributes')) {
-            return $data;
-        }
-
-        $translatable = $record->translatedAttributes;
-        $values = [];
-        foreach ($translatable as $attr) {
-            $translation = $record->getTranslation($this->lang, false);
-            $values[$attr] = $translation ? $translation->$attr : $record->$attr;
+        if (method_exists($record, 'getTranslation') && property_exists($record, 'translatedAttributes')) {
+            $translatable = $record->translatedAttributes;
+            foreach ($translatable as $attr) {
+                $translation = $record->getTranslation($this->lang, false);
+                $values[$attr] = $translation ? $translation->$attr : $record->$attr;
+            }
         }
 
         return $values;