fix getting old values

spatie · Oct 27, 2020 · f249471 · f249471
1 parent 9b5624e
commit f249471
Showing 1 changed file with 13 additions and 11 deletions.
diff --git a/src/MediaCollections/Models/Collections/MediaCollection.php b/src/MediaCollections/Models/Collections/MediaCollection.php
@@ -52,17 +52,19 @@ public function toHtml()
 
     public function jsonSerialize()
     {
-        return old($this->formFieldName ?? $this->collectionName) ?? $this->map(function (Media $media) {
-            return [
-                'name' => $media->name,
-                'file_name' => $media->file_name,
-                'uuid' => $media->uuid,
-                'preview_url' => $media->hasGeneratedConversion('preview') ? $media->getUrl('preview') : '',
-                'order' => $media->order_column,
-                'custom_properties' => $media->custom_properties,
-                'extension' => $media->extension,
-                'size' => $media->size,
-            ];
+        return ($this->formFieldName ?? $this->collectionName)
+            ? old($this->formFieldName ?? $this->collectionName)
+            : $this->map(function (Media $media) {
+                return [
+                    'name' => $media->name,
+                    'file_name' => $media->file_name,
+                    'uuid' => $media->uuid,
+                    'preview_url' => $media->hasGeneratedConversion('preview') ? $media->getUrl('preview') : '',
+                    'order' => $media->order_column,
+                    'custom_properties' => $media->custom_properties,
+                    'extension' => $media->extension,
+                    'size' => $media->size,
+                ];
         })->keyBy('uuid');
     }
 }