From: Vincent Vanwaelscappel Date: Fri, 21 Jan 2022 15:46:25 +0000 (+0100) Subject: wip #5045 @1.5 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=d2881f4c25494ca51217519dda5c8efdc6ab5c00;p=cubist_cms-back.git wip #5045 @1.5 --- diff --git a/src/app/Magic/Fields/Files.php b/src/app/Magic/Fields/Files.php index 108f4c0..e9a9065 100644 --- 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 d75ae9c..8344b31 100644 --- 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) {