From 9e28c2a31557ed0d969f16c90c1140b2232c652e Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Sat, 26 Feb 2022 15:14:30 +0200 Subject: [PATCH] checkforrequired --- files/routes/posts.py | 2 +- files/templates/submit.html | 15 +++++---------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/files/routes/posts.py b/files/routes/posts.py index 639150fe5..7ef2d1f1b 100644 --- a/files/routes/posts.py +++ b/files/routes/posts.py @@ -959,7 +959,7 @@ def submit_post(v, sub=None): else: embed = None else: embed = None - if not url and not request.values.get("body") and not request.files.get("file", None): + if not url and not request.values.get("body") and not request.files.get("file") and not request.files.get("file2"): return error("Please enter a url or some text.") if not title: diff --git a/files/templates/submit.html b/files/templates/submit.html index 6399eca2e..52244875c 100644 --- a/files/templates/submit.html +++ b/files/templates/submit.html @@ -151,7 +151,7 @@
@@ -229,19 +229,16 @@ function checkForRequired() { var title = document.getElementById("post-title"); - var url = document.getElementById("post-url"); - var text = document.getElementById("post-text"); - var button = document.getElementById("create_button"); - var image = document.getElementById("file-upload"); + var image2 = document.getElementById("file-upload-submit"); - if (url.value.length > 0 || image.value.length > 0) { + if (url.value.length > 0 || image.value.length > 0 || image2.value.length > 0) { text.required = false; url.required=false; - } else if (text.value.length > 0 || image.value.length > 0) { + } else if (text.value.length > 0 || image.value.length > 0 || image2.value.length > 0) { url.required = false; } else { text.required = true; @@ -249,12 +246,10 @@ } var isValidTitle = title.checkValidity(); - var isValidURL = url.checkValidity(); - var isValidText = text.checkValidity(); - if (isValidTitle && (isValidURL || image.value.length>0)) { + if (isValidTitle && (isValidURL || image.value.length > 0 || image2.value.length > 0)) { button.disabled = false; } else if (isValidTitle && isValidText) { button.disabled = false;