Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Use fixed spelling of method name hasOpenIDExtractor from PlonePAS.

We depend on Products.PlonePAS 2.0.10dev or higher for this.
Fixes http://dev.plone.org/ticket/11040
  • Loading branch information...
commit 628961e76a486a3b959b31a1b40427924895700e 1 parent f4c5745
Maurits van Rees mauritsvanrees authored
5 CHANGES.txt
@@ -5,6 +5,11 @@ Changelog
5 5 2.0.2 - unreleased
6 6 ------------------
7 7
  8 +- Use fixed spelling of method name hasOpenIDExtractor from PlonePAS.
  9 + We depend on Products.PlonePAS 2.0.10dev or higher for this.
  10 + Fixes http://dev.plone.org/ticket/11040
  11 + [maurits]
  12 +
8 13 - Add MANIFEST.in.
9 14 [WouterVH]
10 15
2  plone/app/openid/portlets/login.py
@@ -30,7 +30,7 @@ def __init__(self, context, request, view, manager, data):
30 30 def available(self):
31 31 if not self.portal_state.anonymous():
32 32 return False
33   - if not self.pas_info.hasOpenIDdExtractor():
  33 + if not self.pas_info.hasOpenIDExtractor():
34 34 return False
35 35 page = self.request.get('URL', '').split('/')[-1]
36 36 return page not in ('login_form', '@@register')
2  plone/app/openid/setuphandlers.py
@@ -10,7 +10,7 @@
10 10
11 11 def hasOpenIdPlugin(portal):
12 12 pas_info=PASInfoView(portal, None)
13   - return pas_info.hasOpenIDdExtractor()
  13 + return pas_info.hasOpenIDExtractor()
14 14
15 15
16 16 def createOpenIdPlugin(portal, out):
2  plone/app/openid/skins/ploneopenid/login_form.cpt
@@ -46,7 +46,7 @@
46 46 <div id="login-form">
47 47 <dl class="enableFormTabbing">
48 48
49   - <tal:openid condition="pas_info/hasOpenIDdExtractor">
  49 + <tal:openid condition="pas_info/hasOpenIDExtractor">
50 50 <dt id="fieldsetlegend-openid-login" i18n:translate="legend_openid">
51 51 OpenID login
52 52 </dt>
6 plone/app/openid/tests/test_view.py
@@ -6,14 +6,14 @@
6 6 class TestOpenIdView(OpenIdTestCase):
7 7 def test_DefaultConfig(self):
8 8 pas_info=self.pas_info
9   - self.assertEquals(pas_info.hasOpenIDdExtractor(), False)
  9 + self.assertEquals(pas_info.hasOpenIDExtractor(), False)
10 10 self.assertEquals(pas_info.hasLoginPasswordExtractor(), True)
11 11
12 12 def test_OpenIdInstalled(self):
13 13 self.portal.portal_setup.runAllImportStepsFromProfile(
14 14 'profile-plone.app.openid:default')
15 15 pas_info=self.pas_info
16   - self.assertEquals(pas_info.hasOpenIDdExtractor(), True)
  16 + self.assertEquals(pas_info.hasOpenIDExtractor(), True)
17 17 self.assertEquals(pas_info.hasLoginPasswordExtractor(), True)
18 18
19 19 def testOnlyOpenIdInstalled(self):
@@ -25,7 +25,7 @@ def testOnlyOpenIdInstalled(self):
25 25 'profile-plone.app.openid:default')
26 26
27 27 pas_info=self.pas_info
28   - self.assertEquals(pas_info.hasOpenIDdExtractor(), True)
  28 + self.assertEquals(pas_info.hasOpenIDExtractor(), True)
29 29 self.assertEquals(pas_info.hasLoginPasswordExtractor(), False)
30 30
31 31
2  setup.py
@@ -38,7 +38,7 @@
38 38 'zope.i18nmessageid',
39 39 'zope.interface',
40 40 'Products.CMFCore',
41   - 'Products.PlonePAS',
  41 + 'Products.PlonePAS>=2.0.10dev',
42 42 'Products.PluggableAuthService',
43 43 'Zope2',
44 44 ],

0 comments on commit 628961e

Please sign in to comment.
Something went wrong with that request. Please try again.