Merge branch 'develop' into main

filamentphp · Mar 10, 2021 · 88981f8 · 88981f8
2 parents e6ecf7e + f73c9bc
commit 88981f8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/packages/forms/resources/views/components/file-upload.blade.php b/packages/forms/resources/views/components/file-upload.blade.php
@@ -37,10 +37,6 @@
     <script src="https://unpkg.com/filepond-plugin-image-transform/dist/filepond-plugin-image-transform.js"></script>
 @endpushonce
 
-@php
-    $formComponent->placeholder = __($formComponent->placeholder);
-@endphp
-
 <x-forms::field-group
     :column-span="$formComponent->columnSpan"
     :error-key="$formComponent->name"
@@ -65,13 +61,13 @@
             FilePond.registerPlugin(FilePondPluginImageTransform)
 
             let config = {
-                acceptedFileTypes: {{ json_encode($formComponent->acceptedFileTypes) }},
+                acceptedFileTypes: @json($formComponent->acceptedFileTypes),
                 files: [],
                 {{ $formComponent->imageCropAspectRatio !== null ? "imageCropAspectRatio: '{$formComponent->imageCropAspectRatio}'," : null }}
                 {{ $formComponent->imagePreviewHeight !== null ? "imagePreviewHeight: {$formComponent->imagePreviewHeight}," : null }}
                 {{ $formComponent->imageResizeTargetHeight !== null ? "imageResizeTargetHeight: {$formComponent->imageResizeTargetHeight}," : null }}
                 {{ $formComponent->imageResizeTargetWidth !== null ? "imageResizeTargetWidth: {$formComponent->imageResizeTargetWidth}," : null }}
-                {{ $formComponent->placeholder !== null ? "labelIdle: '{$formComponent->placeholder} KB'," : null }}
+                {{ __($formComponent->placeholder) !== null ? 'labelIdle: \'' . __($formComponent->placeholder) . '\',' : null }}
                 {{ $formComponent->maxSize !== null ? "maxFileSize: '{$formComponent->maxSize} KB'," : null }}
                 {{ $formComponent->minSize !== null ? "minFileSize: '{$formComponent->minSize} KB'," : null }}
                 server: {

diff --git a/src/Resources/Pages/EditRecord.php b/src/Resources/Pages/EditRecord.php
@@ -72,7 +72,11 @@ public function isAuthorized()
 
     public function mount($record)
     {
-        $this->record = static::getModel()::findOrFail($record);
+        $model = static::getModel();
+
+        $routeKeyName = (new $model())->getRouteKeyName();
+
+        $this->record = $model::where($routeKeyName, $record)->firstOrFail();
     }
 
     public function save()