From 612f3f625eef86c2e5d91c241391c9b18c57b68f Mon Sep 17 00:00:00 2001
From: Jorran de Wit <jorrandewit@outlook.com>
Date: Mon, 19 Jun 2017 20:54:56 +0200
Subject: [PATCH] Improve logic
---
scipost/forms.py | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/scipost/forms.py b/scipost/forms.py
index 7fca3c331..61677101d 100644
--- a/scipost/forms.py
+++ b/scipost/forms.py
@@ -149,12 +149,10 @@ class DraftInvitationForm(forms.ModelForm):
if RegistrationInvitation.objects.filter(email=email).exists():
self.add_error('email', 'This email address has already been used for an invitation')
-
- if DraftInvitation.objects.filter(email=email).exists():
+ elif DraftInvitation.objects.filter(email=email).exists():
self.add_error('email', ('This email address has already been'
' used for a draft invitation'))
-
- if User.objects.filter(email=email).exists():
+ elif User.objects.filter(email=email).exists():
self.add_error('email', 'This email address is already associated to a Contributor')
return email
@@ -208,8 +206,7 @@ class RegistrationInvitationForm(forms.ModelForm):
email = self.cleaned_data['email']
if RegistrationInvitation.objects.filter(email=email).exists():
self.add_error('email', 'This email address has already been used for an invitation')
-
- if User.objects.filter(email=email).exists():
+ elif User.objects.filter(email=email).exists():
self.add_error('email', 'This email address is already associated to a Contributor')
return email
--
GitLab