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

Merge pull request #3543 from alphagov/remove-code-supporting-old-permissions-form_fields

Browse Source 
Revert support for old user permissions params
This commit is contained in:
Tom Byers
2020-08-05 15:51:28 +01:00
committed by GitHub
parent 8b44919551 468a43bd68
commit cd398ab55c
2 changed files with 16 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
app/main/forms.py
View File

@@ -755,20 +755,6 @@ def filter_by_broadcast_permissions(valuelist):
return [entry for entry in valuelist if any(entry in role for role in broadcast_permissions)]
# Included to support both versions of how user permissions are handled in permissions forms
# Remove when changeover to new version (permissions_field) is complete
PermissionsAbstract = type("PermissionsAbstract", (StripWhitespaceForm,), {
permission: BooleanField(label) for permission, label in permissions
})
# Included to support both versions of how user permissions are handled in permissions forms
# Remove when changeover to new version (permissions_field) is complete
BroadcastPermissionsAbstract = type("BroadcastPermissionsAbstract", (StripWhitespaceForm,), {
permission: BooleanField(label) for permission, label in broadcast_permissions
})
class BasePermissionsForm(StripWhitespaceForm):
def __init__(self, all_template_folders=None, *args, **kwargs):
super().__init__(*args, **kwargs)
@@ -804,25 +790,9 @@ class BasePermissionsForm(StripWhitespaceForm):
}
)
# Modified to support both versions of how user permissions are handled in permissions forms
# Remove when changeover to new version (permissions_field) is complete
@property
def permissions(self):
permissions_field_data = set(self.permissions_field.data)
permissions_fields_data = {field.id for field in self.permissions_fields if field.data is True}
if len(permissions_field_data) == 0 and len(permissions_fields_data) != 0:
return permissions_fields_data
else:
return permissions_field_data
# Included to support both versions of how user permissions are handled in permissions forms
# Remove when changeover to new version (permissions_field) is complete
@property
def permissions_fields(self):
return (
getattr(self, permission) for permission, field in self.__dict__.items()
if isinstance(field, BooleanField)
)
return set(self.permissions_field.data)
@classmethod
def from_user(cls, user, service_id, **kwargs):
@@ -836,15 +806,11 @@ class BasePermissionsForm(StripWhitespaceForm):
)
# Included to support both versions of how user permissions are handled in permissions forms
# Remove when changeover to new version (permissions_field) is complete
class PermissionsForm(PermissionsAbstract, BasePermissionsForm):
class PermissionsForm(BasePermissionsForm):
pass
# Included to support both versions of how user permissions are handled in permissions forms
# Remove when changeover to new version (permissions_field) is complete
class BroadcastPermissionsForm(BroadcastPermissionsAbstract, BasePermissionsForm):
class BroadcastPermissionsForm(BasePermissionsForm):
permissions_field = govukCheckboxesField(
'Permissions',