From da657fcf6064547b11680959e9b09f5c7b1ca522 Mon Sep 17 00:00:00 2001
From: Lewis7Lewis <87246452+Lewis7Lewis@users.noreply.github.com>
Date: Fri, 21 Nov 2025 17:29:42 +0100
Subject: [PATCH] Remove console log and keep the classic upload viewable

---
 photologue/static/upload.js | 54 ++++++++++++++++++++++++-------------
 photologue/views.py         |  9 ++++---
 2 files changed, 41 insertions(+), 22 deletions(-)

diff --git a/photologue/static/upload.js b/photologue/static/upload.js
index 03222ae..23a927e 100644
--- a/photologue/static/upload.js
+++ b/photologue/static/upload.js
@@ -42,17 +42,24 @@ document.getElementById('upload_form').addEventListener('submit', (e) => {
     document.getElementById('submit-id-submit').value = "Please be patient";
 });
 
-
 submitbtn = document.getElementById('submit-id-submit');
-submitbtn.type = "button";
+//submitbtn.type = "button";
+
+//submitbtn.addEventListener("click", uplaodfnc);
+
+var ctnbtn = document.createElement("input");
+ctnbtn.classList = submitbtn.classList;
+ctnbtn.value="Continious Upload";
+ctnbtn.type = "button";
 
 async function uplaodfnc() {
 
     console.log(uploadInput.files);
     files = uploadInput.files;
     submitbtn.disabled = true;
+    ctnbtn.disabled = true;
     actual = 0;
-    submitbtn.value = "Please be patient 0% (" + actual + "/" + files.length + ")";
+    ctnbtn.value = "Please be patient 0% (" + actual + "/" + files.length + ")";
 
     csrfvalue = document.getElementsByName("csrfmiddlewaretoken")[0].value;
 
@@ -66,17 +73,18 @@ async function uplaodfnc() {
 
     fdata = new FormData(uploadInput.form);
     fdata.delete("file_field");
-    fdata.append("reptype", "json");
-    console.log(fdata);
+    //fdata.append("reptype", "json");
+
 
     response = await fetch("/upload/", {
         method: "POST",
         body: fdata,
+        headers: {
+            'Accept': 'application/json'
+        }
     });
     returned = await response.json();
 
-    console.log(returned);
-    console.log(returned.code);
     if (returned.code != 200) {
         window.alert("There is an error in the form" + returned.error);
     }
@@ -87,20 +95,22 @@ async function uplaodfnc() {
         sendform = new FormData();
         sendform.append("csrfmiddlewaretoken", csrfvalue);
         sendform.append("file_field", file);
-        sendform.append("reptype", "json");
+        //sendform.append("reptype", "json");
         sendform.append("gallery", returned.galleryID);
 
         try {
             const response = await fetch("/upload/", {
                 method: "POST",
                 body: sendform,
+                headers: {
+            'Accept': 'application/json'
+        }
             });
             okpass = await response.ok;
-            console.log(file.name, okpass);
-            if ( !okpass) {
+            if (!okpass) {
                 window.alert("Error with " + file.name + "code" + await response.code);
             }
-            submitbtn.value = "Please be patient " + Math.round(100 * actual / total) + "% (" + actual + "/" + files.length + ")";
+            ctnbtn.value = "Please be patient " + Math.round(100 * actual / total) + "% (" + actual + "/" + files.length + ")";
 
         } catch (e) {
             console.error(e);
@@ -110,22 +120,30 @@ async function uplaodfnc() {
 
     fdata = new FormData(uploadInput.form);
     fdata.delete("file_field");
-    fdata.append("reptype", "json");
-    fdata.append("end","end")
-    console.log(fdata);
+    fdata.delete("new_gallery_title");
+    fdata.delete("new_galleru_date_start");
+    fdata.delete("new_galleru_date_end");
+    //fdata.append("reptype", "json");
+    fdata.append("gallery", returned.galleryID);
+    fdata.append("end", "end")
 
     response = await fetch("/upload/", {
         method: "POST",
         body: fdata,
+        headers: {
+            'Accept': 'application/json'
+        }
     });
-    returned = await response.json();    
+    returned = await response.json();
 
-    submitbtn.value = "Upload Complete Please reload the page";
+    ctnbtn.value = "Upload Complete Please reload the page";
 }
 
-submitbtn.addEventListener("click", uplaodfnc);
 
-console.log("New Upload File");
+ctnbtn.addEventListener("click", uplaodfnc);
+
+form.appendChild(ctnbtn);
+
 
 
 
diff --git a/photologue/views.py b/photologue/views.py
index fbda394..3027105 100644
--- a/photologue/views.py
+++ b/photologue/views.py
@@ -191,11 +191,12 @@ class GalleryUpload(PermissionRequiredMixin, FormView):
     def form_valid(self, form):
         # Get or create gallery
 
-        if form.data.get("reptype","")=="json":
-            response_json = True
-            finish_json  = form.data.get("end","")=="end"
-        else :
+        if self.request.accepts('text/html') or not self.request.accepts('application/json'):
             response_json = False
+            finish_json = False
+        else :
+            response_json = True
+            finish_json  = form.data.get("end","") == "end"
 
         gallery = form.get_or_create_gallery()