diff --git a/app/main/forms.py b/app/main/forms.py index b2fc0573e..d0685d7dd 100644 --- a/app/main/forms.py +++ b/app/main/forms.py @@ -1043,14 +1043,14 @@ class BroadcastPermissionsForm(BasePermissionsForm): class BaseInviteUserForm(): email_address = email_address(gov_user=False) - def __init__(self, invalid_email_address, *args, **kwargs): + def __init__(self, inviter_email_address, *args, **kwargs): super().__init__(*args, **kwargs) - self.invalid_email_address = invalid_email_address + self.inviter_email_address = inviter_email_address def validate_email_address(self, field): if current_user.platform_admin: return - if field.data.lower() == self.invalid_email_address.lower(): + if field.data.lower() == self.inviter_email_address.lower(): raise ValidationError("You cannot send an invitation to yourself") @@ -1062,19 +1062,19 @@ class BroadcastInviteUserForm(BaseInviteUserForm, BroadcastPermissionsForm): email_address = email_address(gov_user=True) def validate_email_address(self, field): - if not distinct_email_addresses(field.data, self.invalid_email_address): + if not distinct_email_addresses(field.data, self.inviter_email_address): raise ValidationError("You cannot send an invitation to yourself") class InviteOrgUserForm(StripWhitespaceForm): email_address = email_address(gov_user=False) - def __init__(self, invalid_email_address, *args, **kwargs): + def __init__(self, inviter_email_address, *args, **kwargs): super(InviteOrgUserForm, self).__init__(*args, **kwargs) - self.invalid_email_address = invalid_email_address.lower() + self.inviter_email_address = inviter_email_address.lower() def validate_email_address(self, field): - if field.data.lower() == self.invalid_email_address and not current_user.platform_admin: + if field.data.lower() == self.inviter_email_address and not current_user.platform_admin: raise ValidationError("You cannot send an invitation to yourself") diff --git a/app/main/views/manage_users.py b/app/main/views/manage_users.py index 57e00ac3f..7b52d14d3 100644 --- a/app/main/views/manage_users.py +++ b/app/main/views/manage_users.py @@ -59,7 +59,7 @@ def invite_user(service_id, user_id=None): form_class = InviteUserForm form = form_class( - invalid_email_address=current_user.email_address, + inviter_email_address=current_user.email_address, all_template_folders=current_service.all_template_folders, folder_permissions=[f['id'] for f in current_service.all_template_folders] ) diff --git a/app/main/views/organisations.py b/app/main/views/organisations.py index 12405cbd8..867337266 100644 --- a/app/main/views/organisations.py +++ b/app/main/views/organisations.py @@ -184,7 +184,7 @@ def manage_org_users(org_id): @user_has_permissions() def invite_org_user(org_id): form = InviteOrgUserForm( - invalid_email_address=current_user.email_address + inviter_email_address=current_user.email_address ) if form.validate_on_submit(): email_address = form.email_address.data