darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-07-31 11:49:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename confusing variable

Browse Source 
The reason the email address is considered invalid is because it is the
address of the person doing the inviting.

This commit renames the variable to be more specific and avoid confusion
with the email address of the person being invited.
This commit is contained in:
Chris Hill-Scott
2021-07-15 14:21:58 +01:00
parent c3091223a9
commit d749ee5cea
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/main/forms.py
View File

@@ -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")