From 8f0002c5c9dcd3419f4e29ad3d44ca7131793bac Mon Sep 17 00:00:00 2001 From: hernani Date: Wed, 2 Jun 2010 23:25:18 +0000 Subject: [PATCH] Fixes OSQA 307, AttributeError: 'ChangePasswordForm' object has no attribute 'cleaned_data'. git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@360 0cfe37f9-358a-4d5e-be75-b63607b5c754 --- forum/views/auth.py | 14 ++++++++------ forum_modules/localauth/forms.py | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/forum/views/auth.py b/forum/views/auth.py index 9b41503..d321c95 100644 --- a/forum/views/auth.py +++ b/forum/views/auth.py @@ -276,15 +276,17 @@ def auth_settings(request, id): if request.POST: form = FormClass(request.POST, user=user_) if form.is_valid(): - if user_.has_usable_password(): - request.user.message_set.create(message=_("Your password was changed")) - else: + is_new_pass = not user_.has_usable_password() + user_.set_password(form.cleaned_data['password1']) + user_.save() + + if is_new_pass: request.user.message_set.create(message=_("New password set")) if not request.user.is_superuser: form = ChangePasswordForm(user=user_) - - user_.set_password(form.cleaned_data['password1']) - user_.save() + else: + request.user.message_set.create(message=_("Your password was changed")) + return HttpResponseRedirect(reverse('user_authsettings', kwargs={'id': user_.id})) else: form = FormClass(user=user_) diff --git a/forum_modules/localauth/forms.py b/forum_modules/localauth/forms.py index ec59a10..a3fd992 100644 --- a/forum_modules/localauth/forms.py +++ b/forum_modules/localauth/forms.py @@ -92,7 +92,7 @@ class ClassicLoginForm(forms.Form): error_list.append(_('Please enter user name')) if len(error_list) > 0: self._errors['__all__'] = forms.util.ErrorList(error_list) - + return self.cleaned_data def get_user(self): -- 2.45.2