Library Upload : Protect against empty default resize limit CMS setting.

xibosignage/xibo#3159
PeterMis · Oct 19, 2023 · 0bb03a1 · 0bb03a1
1 parent 6a86718
commit 0bb03a1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/ui/src/core/file-upload.js b/ui/src/core/file-upload.js
@@ -44,6 +44,10 @@ function openUploadForm(options) {
         uploadTemplate = Handlebars.compile($("#" + options.templateId).html());
     }
 
+    if (typeof maxImagePixelSize === undefined || maxImagePixelSize === '') {
+        maxImagePixelSize = 0;
+    }
+
     // Handle bars and open a dialog
     var dialog = bootbox.dialog({
         message: uploadTemplate(options.templateOptions),

diff --git a/views/include-file-upload.twig b/views/include-file-upload.twig
@@ -17,7 +17,7 @@
 
 {# Max image resize size from settings #}
 <script type="text/javascript">
-  const maxImagePixelSize = {{ settings.DEFAULT_RESIZE_LIMIT }};
+  let maxImagePixelSize = "{{ settings.DEFAULT_RESIZE_LIMIT }}";
 </script>
 
 {# Handlebars Templates #}