Merge branch 'main' into nmb/email-fix

This commit is contained in:
Neil Martinsen-Burrell 2023-12-12 13:18:55 -06:00
commit 2211cb2bc0
No known key found for this signature in database
GPG key ID: 6A3C818CC10D0184

View file

@ -91,7 +91,8 @@ class User(AbstractUser):
# A new incoming user who is being invited to be a domain manager (that is, # A new incoming user who is being invited to be a domain manager (that is,
# their email address is in DomainInvitation for an invitation that is not yet "retrieved"). # their email address is in DomainInvitation for an invitation that is not yet "retrieved").
if DomainInvitation.objects.filter(email=email, status=DomainInvitation.INVITED).exists(): invited = DomainInvitation.DomainInvitationStatus.INVITED
if DomainInvitation.objects.filter(email=email, status=invited).exists():
return False return False
return True return True