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

merge permission

master
justcool393 2022-10-05 20:33:23 -07:00
parent c813f52c1a
commit 3cf972ef9a
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
files/helpers/const.py
View File

@ -147,6 +147,7 @@ PERMS = { # Minimum admin_level to perform action.
'VIEW_MODMAIL': 2, 'VIEW_MODMAIL': 2,
'PRINT_MARSEYBUX_FOR_KIPPY_ON_PCMEMES': 3, 'PRINT_MARSEYBUX_FOR_KIPPY_ON_PCMEMES': 3,
'VIEW_ACTIVE_USERS': 2, 'VIEW_ACTIVE_USERS': 2,
'MERGE_USERS': 3, # note: extra check for Aevann
} }
FEATURES = { FEATURES = {

4
files/routes/admin.py
View File

@ -44,7 +44,7 @@ def loggedout_list(v):
return render_template("loggedout.html", v=v, users=users) return render_template("loggedout.html", v=v, users=users)
@app.get('/admin/merge/<id1>/<id2>') @app.get('/admin/merge/<id1>/<id2>')
@admin_level_required(3) @admin_level_required(PERMS['MERGE_USERS'])
def merge(v, id1, id2): def merge(v, id1, id2):
if v.id != AEVANN_ID: abort(403) if v.id != AEVANN_ID: abort(403)
@ -106,7 +106,7 @@ def merge(v, id1, id2):
@app.get('/admin/merge_all/<id>') @app.get('/admin/merge_all/<id>')
@admin_level_required(3) @admin_level_required(PERMS['MERGE_USERS'])
def merge_all(v, id): def merge_all(v, id):
if v.id != AEVANN_ID: abort(403) if v.id != AEVANN_ID: abort(403)