From 081f4b1c0a97fb8d0974c639f858ecb7f918fa8e Mon Sep 17 00:00:00 2001 From: Bai Date: Fri, 17 Apr 2020 11:26:29 +0800 Subject: [PATCH] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=AF=86=E7=A0=81=E9=87=8D=E7=BD=AE=E9=A1=B5=E9=9D=A2=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E4=BF=A1=E6=81=AF=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/users/views/login.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/apps/users/views/login.py b/apps/users/views/login.py index 185bea33a..74bb411ab 100644 --- a/apps/users/views/login.py +++ b/apps/users/views/login.py @@ -109,17 +109,21 @@ class UserResetPasswordView(FormView): token = self.request.GET.get('token') user = User.validate_reset_password_token(token) if not user: - return self.get(self.request, errors=_('Token invalid or expired')) + error = _('Token invalid or expired') + form.add_error('new_password', error) + return self.form_invalid(form) if not user.can_update_password(): - errors = _('User auth from {}, go there change password'.format(user.source)) - return self.get(self.request, errors=errors) + error = _('User auth from {}, go there change password'.format(user.source)) + form.add_error('new_password', error) + return self.form_invalid(form) password = form.cleaned_data['new_password'] is_ok = check_password_rules(password) if not is_ok: - errors = _('* Your password does not meet the requirements') - return self.get(self.request, errors=errors) + error = _('* Your password does not meet the requirements') + form.add_error('new_password', error) + return self.form_invalid(form) user.reset_password(password) User.expired_reset_password_token(token)