Fixed yahoo openid auth

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

diff --git a/forum/forms/auth.py b/forum/forms/auth.py
index c1a7c0914f6d5d05372f079247222d43ade4feaa..0d07ce81ad8d2d7ea4f896a6338822d85cc7d0d4 100644 (file)
--- a/forum/forms/auth.py
+++ b/forum/forms/auth.py
@@ -1,6 +1,5 @@
-from general import NextUrlField,  UserNameField,  UserEmailField, SetPasswordForm
+from general import NextUrlField,  UserNameField,  UserEmailField, UserRealNameField, 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
@@ -11,6 +10,7 @@ class SimpleRegistrationForm(forms.Form):
     next = NextUrlField()
     username = UserNameField()
     email = UserEmailField()
+    real_name = UserRealNameField()
 
 class TemporaryLoginRequestForm(forms.Form):
     def __init__(self, data=None):
@@ -35,17 +35,6 @@ class TemporaryLoginRequestForm(forms.Form):
         self.user_cache = users
         return self.cleaned_data['email']
 
-
-class SimpleEmailSubscribeForm(forms.Form):
-    SIMPLE_SUBSCRIBE_CHOICES = (
-        ('y',_('okay, let\'s try!')),
-        ('n',_('no OSQA community email please, thanks'))
-    )
-    subscribe = forms.ChoiceField(widget=forms.widgets.RadioSelect(), \
-                                error_messages={'required':_('please choose one of the options above')},
-                                choices=SIMPLE_SUBSCRIBE_CHOICES, initial=INITIAL_EMAIL_SUBSCRIBE_OPTION)
-
-
 class ChangePasswordForm(SetPasswordForm):
     """ change password form """
     oldpw = forms.CharField(widget=forms.PasswordInput(attrs={'class':'required'}),