merge jambazov -> trunk

[osqa.git] / forum / forms / auth.py

diff --git a/forum/forms/auth.py b/forum/forms/auth.py
index 594e59f8e526de85326df6fe14d2a2a4a6b88b37..c1a7c0914f6d5d05372f079247222d43ade4feaa 100644 (file)
--- a/forum/forms/auth.py
+++ b/forum/forms/auth.py
@@ -1,5 +1,6 @@
 from general import NextUrlField,  UserNameField,  UserEmailField, SetPasswordForm
 from forum.models import Question, User
+from forum.settings import INITIAL_EMAIL_SUBSCRIBE_OPTION
 from django.contrib.contenttypes.models import ContentType
 from django.utils.translation import ugettext as _
 from django.utils.safestring import mark_safe
@@ -26,12 +27,12 @@ class TemporaryLoginRequestForm(forms.Form):
     )
 
     def clean_email(self):
-        try:
-            user = User.objects.get(email=self.cleaned_data['email'])
-        except:
+        users = list(User.objects.filter(email=self.cleaned_data['email']))
+
+        if not len(users):
             raise forms.ValidationError(_("Sorry, but this email is not on our database."))
 
-        self.user_cache = user
+        self.user_cache = users
         return self.cleaned_data['email']
 
 
@@ -42,7 +43,7 @@ class SimpleEmailSubscribeForm(forms.Form):
     )
     subscribe = forms.ChoiceField(widget=forms.widgets.RadioSelect(), \
                                 error_messages={'required':_('please choose one of the options above')},
-                                choices=SIMPLE_SUBSCRIBE_CHOICES)
+                                choices=SIMPLE_SUBSCRIBE_CHOICES, initial=INITIAL_EMAIL_SUBSCRIBE_OPTION)
 
 
 class ChangePasswordForm(SetPasswordForm):