dont use has_permissions to check for platform admins

platform_admin is a separate concept to permissions, so by removing the
checks for it from the current_user.has_permissions function, we can
simplify things greatly. We already record on the user whether they're
a platform admin anyway.
This commit is contained in:
Leo Hemsted
2018-02-27 16:45:20 +00:00
parent 4b69e1003e
commit 7ddad7c99e
18 changed files with 66 additions and 54 deletions

View File

@@ -8,12 +8,12 @@ from app import service_api_client
from app.main import main
from app.main.forms import DateFilterForm
from app.statistics_utils import get_formatted_percentage
from app.utils import user_has_permissions
from app.utils import user_is_platform_admin
@main.route("/platform-admin")
@login_required
@user_has_permissions(admin_override=True)
@user_is_platform_admin
def platform_admin():
form = DateFilterForm(request.args)
api_args = {'detailed': True,
@@ -41,7 +41,7 @@ def platform_admin():
@main.route("/platform-admin/live-services", endpoint='live_services')
@main.route("/platform-admin/trial-services", endpoint='trial_services')
@login_required
@user_has_permissions(admin_override=True)
@user_is_platform_admin
def platform_admin_services():
form = DateFilterForm(request.args)
api_args = {'detailed': True,