darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-20 14:29:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Replace remaining uses of the term "role"

Browse Source 
In one case I did this by refactoring the code to avoid the need
for the "role" variable in the first place.
This commit is contained in:
Ben Thorner
2021-07-22 14:51:52 +01:00
parent dcfff87cc0
commit 354cd8bb16
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/main/forms.py
View File

@@ -945,20 +945,20 @@ class GovukRadiosFieldWithNoneOption(FieldWithNoneOption, GovukRadiosField):
pass
# guard against data entries that aren't a role in permissions
# guard against data entries that aren't a known permission
def filter_by_permissions(valuelist):
if valuelist is None:
return None
else:
return [entry for entry in valuelist if any(entry in role for role in permission_options)]
return [entry for entry in valuelist if any(entry in option for option in permission_options)]
# guard against data entries that aren't a role in broadcast_permission_options
# guard against data entries that aren't a known broadcast permission
def filter_by_broadcast_permissions(valuelist):
if valuelist is None:
return None
else:
return [entry for entry in valuelist if any(entry in role for role in broadcast_permission_options)]
return [entry for entry in valuelist if any(entry in option for option in broadcast_permission_options)]
class BasePermissionsForm(StripWhitespaceForm):
@@ -1005,8 +1005,10 @@ class BasePermissionsForm(StripWhitespaceForm):
form = cls(
**kwargs,
**{
"permissions_field": [
role for role in all_ui_permissions if user.has_permission_for_service(service_id, role)]
"permissions_field": (
user.permissions_for_service(service_id) & all_ui_permissions
)
},
login_authentication=user.auth_type
)