fixed hasMany HasOne inner fields

moonshine-software · Nov 24, 2022 · aa9779a · aa9779a
1 parent c40d3a4
commit aa9779a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/resources/views/fields/file.blade.php b/resources/views/fields/file.blade.php
@@ -10,7 +10,8 @@
                             @include('moonshine::fields.shared.file', [
                                 'index' => $index+1,
                                 'canDownload' => $field->canDownload(),
-                                'value' => $file
+                                'value' => $file,
+                                'field' => $field,
                             ])
 
                             @if($field->isRemovable())
@@ -27,7 +28,8 @@
         @else
             @include('moonshine::fields.shared.file', [
                 'canDownload' => $field->canDownload(),
-                'value' => $field->formViewValue($item)
+                'value' => $field->formViewValue($item),
+                'field' => $field,
             ])
         @endif
     @endif

diff --git a/resources/views/fields/shared/file.blade.php b/resources/views/fields/shared/file.blade.php
@@ -13,7 +13,12 @@
 
         @if($canDownload)
             <div class="ml-4 flex-shrink-0">
-                <a href="{{ Storage::url($value) }}" download
+                <a @if(isset($field) && $field->attributes()->has('x-model'))
+                       :href="({{ $field->attributes()->get('x-model') }}) ? ('{{ Storage::url('') }}' + {{ $field->attributes()->get('x-model') }}) : ''"
+                   @else
+                       href="{{ Storage::url($value) }}"
+                   @endif
+                   download
                    class="font-medium text-pink hover:text-pink transition duration-150 ease-in-out">
                     {{ trans('moonshine::ui.download') }}
                 </a>