From ffdf810aa9de6abcc7d222bf9fbdf48cd98b1634 Mon Sep 17 00:00:00 2001 From: justcool393 Date: Wed, 19 Oct 2022 18:35:58 -0500 Subject: [PATCH] fix 500 and populate page on error --- files/routes/asset_submissions.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/files/routes/asset_submissions.py b/files/routes/asset_submissions.py index 23f9cc934..815190763 100644 --- a/files/routes/asset_submissions.py +++ b/files/routes/asset_submissions.py @@ -350,12 +350,12 @@ if SITE not in ('pcmemes.net', 'watchpeopledie.tv'): tags = request.values.get('tags').lower().strip() def error(error): - return render_template("update_assets.html", v=v, error=error, type="Marsey") + return render_template("update_assets.html", v=v, error=error, name=name, tags=tags, type="Marsey") if not marsey_regex.fullmatch(name): return error("Invalid name!") - existing = g.db.query(Marsey.name).filter_by(name=name).one_or_none() + existing = g.db.query(Marsey).filter_by(name=name).one_or_none() if not existing: return error("A marsey with this name doesn't exist!") @@ -384,8 +384,7 @@ if SITE not in ('pcmemes.net', 'watchpeopledie.tv'): if tags and existing.tags != tags: existing.tags = tags g.db.add(existing) - - if not file and not tags: + elif not file: return error("You need to update this marsey!") ma = ModAction(