[ckan-changes] [okfn/ckan] 5c72aa: Addition to who change (last commit).

Mon Apr 30 11:57:16 UTC 2012

Branch: refs/heads/release-v1.6.1
  Home:   https://github.com/okfn/ckan
  Commit: 5c72aa3d2485ca7fc96f27c567d455c431401b95
      https://github.com/okfn/ckan/commit/5c72aa3d2485ca7fc96f27c567d455c431401b95
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2012-04-30 (Mon, 30 Apr 2012)

  Changed paths:
    M ckan/controllers/user.py
    M ckan/templates/user/login.html

  Log Message:
  -----------
  Addition to who change (last commit).

diff --git a/ckan/controllers/user.py b/ckan/controllers/user.py
index 741cbea..b789eb2 100644
--- a/ckan/controllers/user.py
+++ b/ckan/controllers/user.py
@@ -264,6 +264,7 @@ def login(self):
             g.openid_enabled = False
 
         if not c.user:
+            c.login_handler = h.url_for(self._get_repoze_handler('login_handler_path'))
             return render('user/login.html')
         else:
             return render('user/logout_first.html')
diff --git a/ckan/templates/user/login.html b/ckan/templates/user/login.html
index 9d4c365..1b2e86b 100644
--- a/ckan/templates/user/login.html
+++ b/ckan/templates/user/login.html
@@ -22,7 +22,7 @@
 
   <div py:match="content">
 
-    <form action="${h.url_for('/login_generic')}" method="post" class="form-horizontal" id="login">  
+    <form action="${c.login_handler}" method="post" class="form-horizontal" id="login">  
       <fieldset>
         <!--legend i18n:msg="site_title">Login</legend-->
         <div class="control-group">


================================================================

