Updating error display of max folder size

AsgardCms · Sep 10, 2017 · 3190e06 · 3190e06
1 parent ab05719
commit 3190e06
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/Modules/Media/Assets/js/init-dropzone.js b/Modules/Media/Assets/js/init-dropzone.js
@@ -18,7 +18,12 @@ $( document ).ready(function() {
         }
     });
     myDropzone.on("error", function(file, errorMessage) {
-        var html = '<div class="alert alert-danger" role="alert">' + errorMessage + '</div>';
+        let html;
+        if (typeof(errorMessage) === 'object') {
+            html = '<div class="alert alert-danger" role="alert">' + errorMessage.errors.file.join(', ') + '</div>';
+        } else {
+            html = '<div class="alert alert-danger" role="alert">' + errorMessage + '</div>';
+        }
         $('.col-md-12').first().prepend(html);
         setTimeout(function() {
             myDropzone.removeFile(file);

diff --git a/public/modules/media/js/init-dropzone.js b/public/modules/media/js/init-dropzone.js
@@ -18,7 +18,12 @@ $( document ).ready(function() {
         }
     });
     myDropzone.on("error", function(file, errorMessage) {
-        var html = '<div class="alert alert-danger" role="alert">' + errorMessage + '</div>';
+        let html;
+        if (typeof(errorMessage) === 'object') {
+            html = '<div class="alert alert-danger" role="alert">' + errorMessage.errors.file.join(', ') + '</div>';
+        } else {
+            html = '<div class="alert alert-danger" role="alert">' + errorMessage + '</div>';
+        }
         $('.col-md-12').first().prepend(html);
         setTimeout(function() {
             myDropzone.removeFile(file);