darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-02-05 10:53:28 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix main_nav for platform admin

Browse Source 
Renamed or_ to any_
This commit is contained in:
Rebecca Law
2016-03-30 11:30:18 +01:00
parent 953f2a2245
commit e67bb5f716
10 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/notify_client/models.py
View File

@@ -82,7 +82,7 @@ class User(UserMixin):
def permissions(self, permissions):
raise AttributeError("Read only property")
def has_permissions(self, permissions=[], or_=False, admin_override=False):
def has_permissions(self, permissions=[], any_=False, admin_override=False):
# Only available to the platform admin user
if admin_override and self.platform_admin:
return True
@@ -95,7 +95,7 @@ class User(UserMixin):
# Service id is always set on the request for service specific views.
service_id = request.view_args.get('service_id', None)
if service_id in self._permissions:
if or_:
if any_:
return any([x in self._permissions[service_id] for x in permissions])
return set(self._permissions[service_id]) >= set(permissions)
return False