Merge pull request #3951 from AmarOk1412/hotfix_3912

[Hotfix] Corrige le renvoi d'email à la validation du compte

zds/member/forms.py

@@ -428,32 +428,6 @@ def clean(self):
                                                            u't l\'adresse de courriel soit le nom d\'utilisateur')])
         elif not username and not email:
             self._errors['username'] = self.error_class([_(u'Il vous faut remplir au moins un des deux champs')])
-        else:
-            # run validators
-            if username:
-                validate_not_empty(username)
-                validate_zds_username(username)
-            if email:
-                validate_not_empty(email)
-                validate_zds_email(email)
-
-        return cleaned_data
-
-
-class ForgotPasswordForm(UsernameAndEmailForm):
-
-    def clean(self):
-        cleaned_data = super(UsernameAndEmailForm, self).clean()
-
-        # Clean data
-        username = cleaned_data.get('username')
-        email = cleaned_data.get('email')
-
-        if username and email:
-            self._errors['username'] = self.error_class([_(u'Les deux champs ne doivent pas être rempli. Remplissez soi'
-                                                           u't l\'adresse de courriel soit le nom d\'utilisateur')])
-        elif not username and not email:
-            self._errors['username'] = self.error_class([_(u'Il vous faut remplir au moins un des deux champs')])
         else:
             # run validators
             if username:

zds/member/tests/tests_forms.py

@@ -3,7 +3,7 @@
 
 from zds.member.factories import ProfileFactory, NonAsciiProfileFactory
 from zds.member.forms import LoginForm, RegisterForm, MiniProfileForm, ProfileForm, ChangeUserForm, ChangePasswordForm,\
-    NewPasswordForm, KarmaForm, ForgotPasswordForm
+    NewPasswordForm, KarmaForm, UsernameAndEmailForm
 
 stringof77chars = "abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789-----"
 stringof251chars = u'abcdefghijklmnopqrstuvwxyabcdefghijklmnopqrstuvwxy' \
@@ -436,7 +436,7 @@ def test_match_username_change_password_form(self):
         self.assertFalse(form.is_valid())
 
 
-class ForgotPasswordFormTest(TestCase):
+class UsernameAndEmailFormTest(TestCase):
     """
     Check the form to ask for a new password.
     """
@@ -450,63 +450,63 @@ def test_valid_forgot_password_form(self):
             'username': self.user1.user.username,
             'email': ''
         }
-        form = ForgotPasswordForm(data=data)
+        form = UsernameAndEmailForm(data=data)
         self.assertTrue(form.is_valid())
 
     def test_non_valid_non_ascii_forgot_password_form(self):
         data = {
             'username': self.userNonAscii.user.username,
             'email': ''
         }
-        form = ForgotPasswordForm(data=data)
+        form = UsernameAndEmailForm(data=data)
         self.assertTrue(form.is_valid())
 
     def test_non_valid_non_ascii_email_forgot_password_form(self):
         data = {
             'username': '',
             'email': self.userNonAscii.user.email
         }
-        form = ForgotPasswordForm(data=data)
+        form = UsernameAndEmailForm(data=data)
         self.assertTrue(form.is_valid())
 
     def test_valid_email_forgot_password_form(self):
         data = {
             'email': self.user1.user.email,
             'username': ''
         }
-        form = ForgotPasswordForm(data=data)
+        form = UsernameAndEmailForm(data=data)
         self.assertTrue(form.is_valid())
 
     def test_empty_name_forgot_password_form(self):
         data = {
             'username': '',
             'email': ''
         }
-        form = ForgotPasswordForm(data=data)
+        form = UsernameAndEmailForm(data=data)
         self.assertFalse(form.is_valid())
 
     def test_full_forgot_password_form(self):
         data = {
             'username': 'John Doe',
             'email': 'john.doe@gmail.com'
         }
-        form = ForgotPasswordForm(data=data)
+        form = UsernameAndEmailForm(data=data)
         self.assertFalse(form.is_valid())
 
     def test_unknow_username_forgot_password_form(self):
         data = {
             'username': 'John Doe',
             'email': ''
         }
-        form = ForgotPasswordForm(data=data)
+        form = UsernameAndEmailForm(data=data)
         self.assertFalse(form.is_valid())
 
     def test_unknow_email_forgot_password_form(self):
         data = {
             'email': 'john.doe@gmail.com',
             'username': ''
         }
-        form = ForgotPasswordForm(data=data)
+        form = UsernameAndEmailForm(data=data)
         self.assertFalse(form.is_valid())
 
 

zds/member/views.py

@@ -32,7 +32,7 @@
 from zds.member.decorator import can_write_and_read_now
 from zds.member.forms import LoginForm, MiniProfileForm, ProfileForm, RegisterForm, \
     ChangePasswordForm, ChangeUserForm, NewPasswordForm, \
-    PromoteMemberForm, KarmaForm, UsernameAndEmailForm, ForgotPasswordForm
+    PromoteMemberForm, KarmaForm, UsernameAndEmailForm
 from zds.member.models import Profile, TokenForgotPassword, TokenRegister, KarmaNote
 from zds.mp.models import PrivatePost, PrivateTopic
 from zds.tutorialv2.models.models_database import PublishableContent
@@ -706,7 +706,7 @@ def forgot_password(request):
     """If the user forgot his password, he can have a new one."""
 
     if request.method == "POST":
-        form = ForgotPasswordForm(request.POST)
+        form = UsernameAndEmailForm(request.POST)
         if form.is_valid():
 
             # Get data from form
@@ -750,7 +750,7 @@ def forgot_password(request):
         else:
             return render(request, "member/forgot_password/index.html",
                           {"form": form})
-    form = ForgotPasswordForm()
+    form = UsernameAndEmailForm()
     return render(request, "member/forgot_password/index.html", {"form": form})