Fixes OSQA 307, AttributeError: 'ChangePasswordForm' object has no attribute 'cleaned...

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@360 0cfe37f9-358a-4d5e-be75-b63607b5c754

diff --git a/forum/views/auth.py b/forum/views/auth.py
index 9b41503120f3f9e8549d51a43da1de2f7e993e09..d321c9563ffa4513f436c4603680737ad1b31cf6 100644 (file)
--- 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 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_)
                 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_)
             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 ec59a10f1b0cdf2d50425407642ce91d233de4d4..a3fd9928be7a59beb026f38f431fb2a2dc687583 100644 (file)
--- 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)
             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):
         return self.cleaned_data
 
     def get_user(self):