From: Eevee <git@veekun.com>
Date: Fri, 7 May 2010 04:40:45 +0000 (-0700)
Subject: Name the openid field "openid_identifier".  #258
X-Git-Tag: veekun-promotions/2010050901~3
X-Git-Url: http://git.veekun.com/zzz-spline-users.git/commitdiff_plain/ef84ec8cca82b01bdec296d7c02001b7b212ff5f?ds=sidebyside

Name the openid field "openid_identifier".  #258
---

diff --git a/spline/plugins/users/controllers/accounts.py b/spline/plugins/users/controllers/accounts.py
index 5f7ef20..9add733 100644
--- a/spline/plugins/users/controllers/accounts.py
+++ b/spline/plugins/users/controllers/accounts.py
@@ -23,7 +23,7 @@ class AccountsController(BaseController):
     def _bail(self, reason):
         # Used for bailing on a login attempt; reshows the login page
         c.error = reason
-        c.attempted_openid = request.params.get('openid', '')
+        c.attempted_openid = request.params.get('openid_identifier', '')
         return render('/users/login.mako')
 
 
@@ -38,7 +38,7 @@ class AccountsController(BaseController):
         cons = Consumer(session=session, store=self.openid_store)
 
         try:
-            openid_url = request.params['openid']
+            openid_url = request.params['openid_identifier']
         except KeyError:
             return self._bail("Gotta enter an OpenID to log in.")
 
diff --git a/spline/plugins/users/templates/users/login.mako b/spline/plugins/users/templates/users/login.mako
index 13bb0bc..9de4487 100644
--- a/spline/plugins/users/templates/users/login.mako
+++ b/spline/plugins/users/templates/users/login.mako
@@ -9,7 +9,7 @@
 
 ${h.form(url(controller='accounts', action='login_begin'), id='user')}
     <img src="${h.static_uri('spline', 'icons/openid.png')}">
-    <input type="text" name="openid" size="30" value="${c.attempted_openid or ''}">
+    <input type="text" name="openid_identifier" size="30" value="${c.attempted_openid or ''}">
     <input type="submit" value="Log in">
 ${h.end_form()}