wip #7930 @2

diff --git a/composer.json b/composer.json
index feecd8c95df231c6a5c5c8b360d91f8021827a52..719445b62c96916724114ad6848a39f0305e0421 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -38,8 +38,8 @@
         "cviebrock/eloquent-sluggable": "^10.0.0",
         "lavary/laravel-menu": "^v1.8.3",
         "graham-campbell/markdown": "^v15.3.0",
-        "barryvdh/laravel-debugbar": "^v3.15.0",
-        "league/commonmark": "^2.7.0",
+        "barryvdh/laravel-debugbar": "^v3.16.0",
+        "league/commonmark": "^2.8.0",
         "cviebrock/laravel-elasticsearch": "^10.0.0",
         "spatie/laravel-honeypot": "^4.6.0",
         "chrisjean/php-ico": "^1.0.4",
@@ -47,7 +47,7 @@
         "cache/redis-adapter": "^1.2.0",
         "backpack/revise-operation": "^1.0.12",
         "digitallyhappy/toggle-field-for-backpack": "^2.0.1",
-        "laravel/framework": "^v10.48.0",
+        "laravel/framework": "^v10.50.0",
         "laravel-lang/lang": "12.19.4",
         "laravel-lang/publisher": "^v14.7.4",
         "spatie/laravel-permission": "^4.4.3|^5.11.0",
@@ -55,7 +55,7 @@
     },
     "require-dev": {
         "filp/whoops": "^2.18",
-        "laravel/tinker": "^v2.10",
+        "laravel/tinker": "^v2.11",
         "barryvdh/laravel-ide-helper": "^v2.15"
     },
     "extra": {

diff --git a/src/app/Magic/Fields/HiddenFileStandaloneForm.php b/src/app/Magic/Fields/HiddenFileStandaloneForm.php
index df076005222bc77e937f20c6d4f43ef399e38871..73245ec602c8f82d77214927574abd55b0d9e31d 100644 (file)
--- a/src/app/Magic/Fields/HiddenFileStandaloneForm.php
+++ b/src/app/Magic/Fields/HiddenFileStandaloneForm.php
@@ -2,30 +2,18 @@
 
 namespace Cubist\Backpack\Magic\Fields;
 
+use Cubist\Backpack\CubistBackpackServiceProvider;
+
 class HiddenFileStandaloneForm extends Field
 {
 
     protected $_adminType = 'hiddenfilestandaloneform';
-    protected $_disk = 'uploads';
+    protected $_viewNamespace = CubistBackpackServiceProvider::NAMESPACE . '::fields';
 
     protected $_multiple = false;
 
-    protected function getFieldAttributes()
-    {
-        $res = parent::getFieldAttributes();
-        $res['upload'] = true;
-        $res['disk'] = $this->_disk;
-        $res['multiple'] = $this->_multiple;
-        return $res;
-    }
-
-    protected function _postSetAttributes()
+    public function getDefaultAttributes()
     {
-        parent::_postSetAttributes();
-        if ($this->getAttribute('multiple', false)) {
-            $this->_adminType = 'upload_multiple';
-        } else {
-            $this->_adminType = 'upload';
-        }
+        return ['trigger' => '', 'action' => '','multiple'=>$this->_multiple] + parent::getDefaultAttributes();
     }
 }

diff --git a/src/resources/views/fields/hiddenfilestandaloneform.blade.php b/src/resources/views/fields/hiddenfilestandaloneform.blade.php
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a01a3b28b7af4086a8a712542723791a2dc6b02e 100644 (file)
--- a/src/resources/views/fields/hiddenfilestandaloneform.blade.php
+++ b/src/resources/views/fields/hiddenfilestandaloneform.blade.php
@@ -0,0 +1,27 @@
+@php
+    $id='hiddenfilestandaloneform_'.rand(1,10000000);
+@endphp
+
+@push('before_scripts')
+    <form style="visibility: hidden;" method="post" id="{!! $id !!}" enctype="multipart/form-data"
+          action="{{$field['action']}}">
+        <input type="file" @if($field['multiple'])name="file[]" multiple="multiple" @else name="file" @endif />
+    </form>
+@endpush
+
+@if ($crud->checkIfFieldIsFirstOfItsType($field))
+    @push('crud_fields_scripts')
+        <script>
+            $(function () {
+                $('{!! $field['trigger'] !!}').on('click', function () {
+                    $("#{!! $id !!}").find('input').get(0).click();
+                    return false;
+                });
+
+                $("#{!! $id !!} input").on('change', function () {
+                    $("#{!! $id !!}").submit();
+                })
+            });
+        </script>
+    @endpush
+@endif