wip #5045 @1.5

diff --git a/src/app/Magic/Fields/Files.php b/src/app/Magic/Fields/Files.php
index 108f4c047d345c55ad8f0c85a05877b57c5a05f9..e9a9065e27dc10172f47fb049f9d56e0630fe02c 100644 (file)
--- a/src/app/Magic/Fields/Files.php
+++ b/src/app/Magic/Fields/Files.php
@@ -23,7 +23,6 @@ class Files extends Field
         return array_merge(parent::getDefaultAttributes(), [
             'name_as_collection' => $this->_nameAsCollection,
             'form' => 'update',
-            'mime_types' => $this->_mimeTypes,
             'collection' => $collection,
             'thumb_conversion' => $this->_thumbConversion,
             'default' => $collection,
@@ -33,7 +32,8 @@ class Files extends Field
                     'thumbnailWidth' => 120,
                     'maxFilesize' => 1024,
                     'createImageThumbnails' => true,
-                    'maxFiles' => $this->_maxFiles
+                    'maxFiles' => $this->_maxFiles,
+                    'acceptedFiles' => $this->_mimeTypes,
                 ]
         ]);
     }
@@ -46,6 +46,7 @@ class Files extends Field
             $this->setAttribute('collection', $name);
             $this->setAttribute('default', $name);
         }
+
     }
 
     protected function _getAttributesAliases()
@@ -56,6 +57,8 @@ class Files extends Field
             'addRemoveLinks' => 'options.addRemoveLinks',
             'createImageThumbnails' => 'options.createImageThumbnails',
             'maxFilesize' => 'options.maxFilesize',
+            'acceptedFiles' => 'options.acceptedFiles',
+            'mime_types' => 'options.acceptedFiles',
         ]);
     }
 

diff --git a/src/resources/views/fields/dropzone_media.blade.php b/src/resources/views/fields/dropzone_media.blade.php
index d75ae9c5582a607cf5c4fedaa9807c0c752cb6a9..8344b31d365210824afafcc3413aa8e351ce855f 100644 (file)
--- a/src/resources/views/fields/dropzone_media.blade.php
+++ b/src/resources/views/fields/dropzone_media.blade.php
@@ -229,7 +229,8 @@ $collection = old(square_brackets_to_dots($field['name'])) ?? $field['value'] ??
 
 
                     function initOneDropzone(el) {
-                        var el = $(el);
+                        el = $(el);
+                        console.log(el);
                         var base_url = el.data('url');
                         var el_id = $(el).attr('id');
                         var collection = $(el).prev().val();
@@ -330,6 +331,7 @@ $collection = old(square_brackets_to_dots($field['name'])) ?? $field['value'] ??
                         };
 
                         var options = jQuery.extend(dOptions, $(el).data('options'));
+                        console.log(options);
                         var dropzone = new Dropzone("#" + el_id, options);
 
                         dropzone.on("maxfilesexceeded", function (file) {