[08/15] git commit: [#7432] ticket:598 Fix user of password change form

[br...@apache.org]

[#7432] ticket:598 Fix user of password change form


Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/1c81d7be
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/1c81d7be
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/1c81d7be

Branch: refs/heads/master
Commit: 1c81d7be0e428f21c09a9c73e6af506c0e0f4009
Parents: 9003580
Author: Igor Bondarenko <je...@gmail.com>
Authored: Fri Jun 6 11:14:42 2014 +0300
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Fri Jun 20 15:45:57 2014 +0000

----------------------------------------------------------------------
 Allura/allura/controllers/auth.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/1c81d7be/Allura/allura/controllers/auth.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/auth.py b/Allura/allura/controllers/auth.py
index 5113540..f8b0f3a 100644
--- a/Allura/allura/controllers/auth.py
+++ b/Allura/allura/controllers/auth.py
@@ -340,7 +340,7 @@ class AuthController(BaseController):
     @expose('jinja:allura:templates/pwd_expired.html')
     @without_trailing_slash
     def pwd_expired(self, **kw):
-        c.form = g.theme.password_change_form
+        c.form = F.password_change_form
         return {}
 
     @expose()
@@ -348,7 +348,7 @@ class AuthController(BaseController):
     @without_trailing_slash
     @validate(V.NullValidator(), error_handler=pwd_expired)
     def pwd_expired_change(self, **kw):
-        kw = g.theme.password_change_form.to_python(kw, None)
+        kw = F.password_change_form.to_python(kw, None)
         ap = plugin.AuthenticationProvider.get(request)
         try:
             ap.set_password(c.user, kw['oldpw'], kw['pw'])