Completion of the platform admin user story.

This commit is contained in:
Rebecca Law
2016-03-18 16:20:37 +00:00
parent d003dc4aa9
commit 13d9acf7dd
14 changed files with 177 additions and 162 deletions

View File

@@ -35,10 +35,8 @@ def user_has_permissions(*permissions, admin_override=False, or_=False):
@wraps(func)
def wrap_func(*args, **kwargs):
from flask_login import current_user
if current_user and admin_override and current_user.platform_admin:
return func(*args, **kwargs)
from flask import request
if current_user and current_user.has_permissions(permissions, service_id=request.view_args.get('service_id', None), admin_override=admin_override, or_=or_):
if current_user and current_user.has_permissions(permissions=permissions,
admin_override=admin_override, or_=or_):
return func(*args, **kwargs)
else:
abort(403)