carpathianflorist
/
MarseyWorld
forked from MarseyWorld/MarseyWorld
1
0
Fork 0
Code Pull Requests Activity

fix badge_grant errors for the api

master
Aevann 2023-03-17 19:59:55 +02:00
parent cfcc95c35d
commit 4fc5e2aa8d
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
files/routes/admin.py
View File

@ -441,7 +441,9 @@ def badge_grant_post(v):
user = get_user(request.values.get("username"), graceful=True) user = get_user(request.values.get("username"), graceful=True)
if not user: 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")) try: badge_id = int(request.values.get("badge_id"))
except: abort(400) except: abort(400)
@ -465,8 +467,14 @@ def badge_grant_post(v):
existing.url = url existing.url = url
existing.description = description existing.description = description
g.db.add(existing) 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( new_badge = Badge(
badge_id=badge_id, badge_id=badge_id,