1 files changed, 69 insertions, 18 deletions
diff --git a/account/forms.py b/account/forms.py
index ca54711..f5f515f 100644
--- a/account/forms.py
+++ b/account/forms.py
@@ -5,6 +5,8 @@ account/forms.py for skaschool
 """
 
 from django import forms
+from django.contrib.auth.models import User
+from django.contrib.sites.models import Site, RequestSite
 from registration.forms import RegistrationFormUniqueEmail
 from django.utils.translation import ugettext_lazy as _
 
@@ -17,27 +19,76 @@ class UserRegForm(RegistrationFormUniqueEmail):
     add fields 'realname', 'gender', 'institute' and 'captcha'
     """
     # XXX: keep consistent with GENDERS in 'models.UserProfile'
-    GENDERS = (
-        ('M', _("Male")),
-        ('F', _("Female")),
-        ('X', _("Secret")),
-    )
+    GENDERS = UserProfile.GENDERS
+    IDENTIFIES = UserProfile.IDENTIFIES
     realname = forms.CharField(max_length=30, label=_("Name"))
     gender = forms.ChoiceField(choices=GENDERS, label=_("Gender"))
     institute = forms.CharField(max_length=100, label=_("Institute"))
+    identify = forms.ChoiceField(choices=IDENTIFIES, label=_("Identify"))
 
-    def __init__(self, *args, **kw):
-        super(UserRegForm, self).__init__(*args, **kw)
-        # order form fields
-        self.fields.keyOrder = [
-                'username',
-                'email',
-                'password1',
-                'password2',
-                'realname',
-                'gender',
-                'institute',
-        ]
+    #def __init__(self, *args, **kw):
+    #    super(UserRegForm, self).__init__(*args, **kw)
+    #    # order form fields
+    #    self.fields.keyOrder = [
+    #            'username',
+    #            'email',
+    #            'password1',
+    #            'password2',
+    #            'realname',
+    #            'gender',
+    #            'institute',
+    #            'identify',
+    #    ]
+
+
+class ResendEmailForm(forms.Form):
+    """
+    form used in ResendEmailView
+    """
+    username = forms.RegexField(regex=r'^[\w.@+-]+$',
+                                max_length=30,
+                                label=_("Username"),
+                                error_messages={'invalid': _("This value may contain only letters, numbers and @/./+/-/_ characters.")})
+    is_update_email = forms.BooleanField(label=_("Is update email"),
+            required=False, initial=False)
+    email = forms.EmailField(label=_("E-mail"), required=False)
+
+    def clean_username(self):
+        username = self.cleaned_data.get('username', '')
+        user = User.objects.filter(username=username)
+        if not user:
+            raise forms.ValidationError(_("Username not exists"), code='invalid')
+        return username
+
+    def clean(self):
+        # if 'is_update_email' True, then email field is required
+        is_update_email = self.cleaned_data.get('is_update_email', False)
+        email = self.cleaned_data.get('email', '')
+        if (is_update_email and (not email)):
+            raise forms.ValidationError(_("Email is required"), code='required')
+        return self.cleaned_data
+
+    def update_email(self):
+        # update User email if user provided a different email
+        username = self.cleaned_data.get('username', '')
+        email = self.cleaned_data.get('email', '')
+        user = User.objects.get(username=username)
+        if email:
+            user.email = email
+            user.save()
+
+    def resend_email(self):
+        # resend activation email
+        if Site._meta.installed:
+            site = Site.objects.get_current()
+        else:
+            site = RequestSite(self.request)
+
+        username = self.cleaned_data.get('username', '')
+        user = User.objects.get(username=username)
+        regprofile = user.registrationprofile_set.get(user=user)
+        if not regprofile.activation_key_expired():
+            regprofile.send_activation_email(site)
 
 
 class UpdateProfileForm(forms.ModelForm):
@@ -49,6 +100,6 @@ class UpdateProfileForm(forms.ModelForm):
 
     class Meta:
         model = UserProfile
-        fields = ('realname', 'gender', 'institute')
+        fields = ('realname', 'gender', 'institute', 'identify')