Merge pull request #5 from anomalylabs/feature-notify-when-overwritin…

…g-files File field type notifies when overwriting a file
anomalylabs · May 17, 2016 · 9992b63 · 9992b63
2 parents 5951863 + 04d96a9
commit 9992b63
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/resources/js/upload.js b/resources/js/upload.js
@@ -1,3 +1,6 @@
+// Disabling autoDiscover, otherwise Dropzone will try to attach twice.
+Dropzone.autoDiscover = false;
+
 $(function () {
 
     var uploaded = [];
@@ -19,7 +22,18 @@ $(function () {
             sending: function (file, xhr, formData) {
                 formData.append('folder', element.data('folder'));
             },
+            accept: function(file, done) {
+                $.getJSON('/admin/files/exists/' + element.data('folder') + '/' + file.name, function(data) {
+                    if(data.exists) {
+                        if(!confirm(file.name + " " + element.data('overwrite'))) {
+                            dropzone.removeFile(file);
+                            return;
+                        }
+                    }
 
+                    done();
+                });
+            },
             autoQueue: true,
             thumbnailWidth: 24,
             thumbnailHeight: 24,

diff --git a/resources/lang/en/message.php b/resources/lang/en/message.php
@@ -6,6 +6,7 @@
     'choose_files'      => 'Which files would you like to use?',
     'no_files_selected' => 'No files selected.',
     'no_uploads'        => 'No files uploaded.',
+    'overwrite'         => 'has already been uploaded. Would you like to overwrite it?',
     'uploading'         => 'Uploading',
     'loading'           => 'Loading'
 ];
diff --git a/resources/views/upload/partials/body.twig b/resources/views/upload/partials/body.twig
@@ -7,6 +7,7 @@
          data-message="{{ trans('anomaly.field_type.files::message.upload') }}"
          data-loading="{{ trans('anomaly.field_type.files::message.loading') }}"
          data-uploading="{{ trans('anomaly.field_type.files::message.uploading') }}"
+         data-overwrite="{{ trans('anomaly.field_type.file::message.overwrite') }}"
          data-max-parallel="{{ setting_value('anomaly.module.files::max_parallel_uploads', 3) }}"
          data-allowed="{{ folder.allowed_types.value ? '.' ~ folder.allowed_types.value|join(',.') }}"></div>