From 4fc5e2aa8dc4c13be91ebb22083d10d32732b9c9 Mon Sep 17 00:00:00 2001 From: Aevann Date: Fri, 17 Mar 2023 19:59:55 +0200 Subject: [PATCH] fix badge_grant errors for the api --- files/routes/admin.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/files/routes/admin.py b/files/routes/admin.py index 66b91c917..3cf64db5a 100644 --- a/files/routes/admin.py +++ b/files/routes/admin.py @@ -441,7 +441,9 @@ def badge_grant_post(v): user = get_user(request.values.get("username"), graceful=True) if not user: - return render_template("admin/badge_admin.html", v=v, badge_types=badges, grant=True, error="User not found!") + error = "User not found!" + if v.client: return {"error": error} + return render_template("admin/badge_admin.html", v=v, badge_types=badges, grant=True, error=error) try: badge_id = int(request.values.get("badge_id")) except: abort(400) @@ -465,8 +467,14 @@ def badge_grant_post(v): existing.url = url existing.description = description g.db.add(existing) - return render_template("admin/badge_admin.html", v=v, badge_types=badges, grant=True, msg="Badge attributes edited successfully!") - return render_template("admin/badge_admin.html", v=v, badge_types=badges, grant=True, error="User already has that badge!") + + msg = "Badge attributes edited successfully!" + if v.client: return {"message": msg} + return render_template("admin/badge_admin.html", v=v, badge_types=badges, grant=True, msg=msg) + + error = "User already has that badge!" + if v.client: return {"error": error} + return render_template("admin/badge_admin.html", v=v, badge_types=badges, grant=True, error=error) new_badge = Badge( badge_id=badge_id,