diff --git a/files/routes/settings.py b/files/routes/settings.py index e9aeb6a0e..15cf5c676 100644 --- a/files/routes/settings.py +++ b/files/routes/settings.py @@ -848,8 +848,6 @@ def settings_profilecss(v): @validate_formkey def settings_block_user(v): - if v and v.admin_level: return {"error": "Admins can't block users."}, 403 - user = get_user(request.values.get("username"), graceful=True) if not user: return {"error": "That user doesn't exist."}, 404 diff --git a/files/templates/comments.html b/files/templates/comments.html index 4f67835aa..26168e833 100644 --- a/files/templates/comments.html +++ b/files/templates/comments.html @@ -366,7 +366,7 @@ Distinguish {% endif %} - {% if v and not v.id==c.author_id and not v.admin_level %} + {% if v and not v.id==c.author_id %} Unblock user Are you sure? @@ -556,7 +556,7 @@ API App {% endif %} - {% if not v.id==c.author_id and not v.admin_level %} + {% if not v.id==c.author_id %} Unblock user Are you sure? diff --git a/files/templates/submission.html b/files/templates/submission.html index 4ea6872bc..6c9dc11cb 100644 --- a/files/templates/submission.html +++ b/files/templates/submission.html @@ -247,7 +247,7 @@ {% endif %} - {% if v and v.id != p.author_id and not v.admin_level %} + {% if v and v.id != p.author_id %} @@ -567,7 +567,7 @@ API App {% endif %} - {% if not v.id==p.author_id and not v.admin_level %} + {% if not v.id==p.author_id %} Unblock user Are you sure? diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html index 6527ea6a7..e95b4b0d5 100644 --- a/files/templates/submission_listing.html +++ b/files/templates/submission_listing.html @@ -270,7 +270,7 @@ API App {% endif %} - {% if not v.id==p.author_id and not v.admin_level %} + {% if not v.id==p.author_id %} Unblock user Are you sure? @@ -434,7 +434,7 @@ {% endif %} - {% if v and v.id != p.author_id and not v.admin_level %} + {% if v and v.id != p.author_id %}