From cb01a8d0fc658821a9fcf313007da00a528c2008 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Wed, 1 May 2013 21:09:24 -0400 Subject: removed possibility to have >1 account with the same email address --- askbot/deps/django_authopenid/forms.py | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) (limited to 'askbot/deps/django_authopenid/forms.py') diff --git a/askbot/deps/django_authopenid/forms.py b/askbot/deps/django_authopenid/forms.py index 332496b5..4ce7242b 100644 --- a/askbot/deps/django_authopenid/forms.py +++ b/askbot/deps/django_authopenid/forms.py @@ -363,21 +363,18 @@ class ChangeEmailForm(forms.Form): def clean_email(self): """ check if email don't exist """ if 'email' in self.cleaned_data: - if askbot_settings.EMAIL_UNIQUE == True: - try: - user = User.objects.get(email = self.cleaned_data['email']) - if self.user and self.user == user: - return self.cleaned_data['email'] - except User.DoesNotExist: + try: + user = User.objects.get(email = self.cleaned_data['email']) + if self.user and self.user == user: return self.cleaned_data['email'] - except User.MultipleObjectsReturned: - raise forms.ValidationError(u'There is already more than one \ - account registered with that e-mail address. Please try \ - another.') - raise forms.ValidationError(u'This email is already registered \ - in our database. Please choose another.') - else: + except User.DoesNotExist: return self.cleaned_data['email'] + except User.MultipleObjectsReturned: + raise forms.ValidationError(u'There is already more than one \ + account registered with that e-mail address. Please try \ + another.') + raise forms.ValidationError(u'This email is already registered \ + in our database. Please choose another.') class AccountRecoveryForm(forms.Form): """with this form user enters email address and @@ -395,9 +392,9 @@ class AccountRecoveryForm(forms.Form): if 'email' in self.cleaned_data: email = self.cleaned_data['email'] try: - user = User.objects.get(email__iexact=email) + user = User.objects.filter(email__iexact=email)[0] self.cleaned_data['user'] = user - except User.DoesNotExist: + except KeyError: del self.cleaned_data['email'] message = _('Sorry, we don\'t have this email address in the database') raise forms.ValidationError(message) -- cgit v1.2.3-1-g7c22