From 0d4399b81df49e8c5cd61d6bdbbfecdeca8a3ff1 Mon Sep 17 00:00:00 2001 From: Robert McWilliam Date: Thu, 30 May 2024 10:47:32 +0100 Subject: [PATCH] Tweak permissions for volunteer role admin --- apps/volunteer/choose_roles.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apps/volunteer/choose_roles.py b/apps/volunteer/choose_roles.py index 140934c17..6a89ce9b8 100644 --- a/apps/volunteer/choose_roles.py +++ b/apps/volunteer/choose_roles.py @@ -115,7 +115,9 @@ def choose_role(): @v_user_required def role_admin_index(): roles = [] - if current_user.has_permission("admin") or current_user.has_permission("volunteer:manager"): + if (current_user.has_permission("admin") or + current_user.has_permission("volunteer:manager") or + current_user.has_permission("volunteer:admin")): roles = Role.query.order_by("name").all() else: roles = [admin.role for admin in current_user.volunteer_admin_roles] @@ -163,7 +165,8 @@ def role_admin_required(f, *args, **kwargs): if current_user.is_authenticated: if int(args[0]) in [ ra.role_id for ra in current_user.volunteer_admin_roles - ] or current_user.has_permission("volunteer:admin"): + ] or (current_user.has_permission("volunteer:admin") or + current_user.has_permission("volunteer:manager")): return f(*args, **kwargs) abort(404) return app.login_manager.unauthorized()