Merge pull request #521 from moevm/520_fix_button_upld

fix button upload
moevm · Mar 29, 2024 · 7262350 · 7262350
2 parents cfdcc7f + d4b0a11
commit 7262350
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 7 deletions.
diff --git a/app/templates/upload.html b/app/templates/upload.html
@@ -12,6 +12,7 @@
         <script>
             const file_upload_limit = {{ config.MAX_CONTENT_LENGTH | tojson }};
             const file_type = "{{file_type}}";
+            const two_files_info = {{ current_user.two_files | tojson }};
         </script>
         <div class="col-11 col-sm-8 col-md-5 col-lg-4 my-auto">
             <h3 class="text-center ins" id="upload_title">{{ upload_title }}</h3>

diff --git a/assets/scripts/upload.js b/assets/scripts/upload.js
@@ -61,19 +61,30 @@ const resetFileUpload = () => {
 };
 
 const changeUploadButton = () => {
-    if (pdf_uploaded || file_uploaded) {
-        const pdf_size = pdf_file_input.prop("files")[0]?.size || 0;
+    if (two_files_info) {
+        if (pdf_uploaded || file_uploaded) {
+            const pdf_size = pdf_file_input.prop("files")[0]?.size || 0;
+            const file_size = file_input.prop("files")[0]?.size || 0;
+            if (pdf_size + file_size <= file_upload_limit) {
+                if (file_uploaded)
+                    upload_button.prop("disabled", false);
+            } else {
+                showSizeExceedMessage();
+                resetFileUpload();
+                upload_button.prop("disabled", true);
+            }
+        } else {
+            upload_button.prop("disabled", true);
+        }
+    } else {
         const file_size = file_input.prop("files")[0]?.size || 0;
-        if (pdf_size + file_size <= file_upload_limit) {
-            if (file_uploaded)
-                upload_button.prop("disabled", false);
+        if (file_size <= file_upload_limit) {
+            upload_button.prop("disabled", false);
         } else {
             showSizeExceedMessage();
             resetFileUpload();
             upload_button.prop("disabled", true);
         }
-    } else {
-        upload_button.prop("disabled", true);
     }
 };