[Erp5-report] r40381 kazuhiko - in /erp5/trunk/products/ERP5Security: ./ tests/ www/
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Nov 18 15:57:53 CET 2010
Author: kazuhiko
Date: Thu Nov 18 15:57:52 2010
New Revision: 40381
URL: http://svn.erp5.org?rev=40381&view=rev
Log:
fix typos, sorry.
Modified:
erp5/trunk/products/ERP5Security/ERP5ExternalAuthenticationPlugin.py
erp5/trunk/products/ERP5Security/__init__.py
erp5/trunk/products/ERP5Security/tests/testERP5Security.py
erp5/trunk/products/ERP5Security/www/ERP5Security_addERP5ExternalAuthenticationPlugin.zpt
Modified: erp5/trunk/products/ERP5Security/ERP5ExternalAuthenticationPlugin.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Security/ERP5ExternalAuthenticationPlugin.py?rev=40381&r1=40380&r2=40381&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Security/ERP5ExternalAuthenticationPlugin.py [utf8] (original)
+++ erp5/trunk/products/ERP5Security/ERP5ExternalAuthenticationPlugin.py [utf8] Thu Nov 18 15:57:52 2010
@@ -48,25 +48,25 @@ from Products.ERP5Security.ERP5UserManag
SUPER_USER, _AuthenticationFailure
#Form for new plugin in ZMI
-manage_addERP5ExternalAuthicationPluginForm = PageTemplateFile(
- 'www/ERP5Security_addERP5ExternalAuthicationPlugin', globals(),
- __name__='manage_addERP5ExternalAuthicationPluginForm')
+manage_addERP5ExternalAuthenticationPluginForm = PageTemplateFile(
+ 'www/ERP5Security_addERP5ExternalAuthenticationPlugin', globals(),
+ __name__='manage_addERP5ExternalAuthenticationPluginForm')
-def addERP5ExternalAuthicationPlugin(dispatcher, id, title=None, user_id_key='',
+def addERP5ExternalAuthenticationPlugin(dispatcher, id, title=None, user_id_key='',
REQUEST=None):
- """ Add a ERP5ExternalAuthicationPlugin to a Pluggable Auth Service. """
+ """ Add a ERP5ExternalAuthenticationPlugin to a Pluggable Auth Service. """
- plugin = ERP5ExternalAuthicationPlugin( id, title, user_id_key)
+ plugin = ERP5ExternalAuthenticationPlugin( id, title, user_id_key)
dispatcher._setObject(plugin.getId(), plugin)
if REQUEST is not None:
REQUEST['RESPONSE'].redirect(
'%s/manage_workspace'
'?manage_tabs_message='
- 'ERP5ExternalAuthicationPlugin+added.'
+ 'ERP5ExternalAuthenticationPlugin+added.'
% dispatcher.absolute_url())
-class ERP5ExternalAuthicationPlugin(ERP5UserManager, CookieAuthHelper):
+class ERP5ExternalAuthenticationPlugin(ERP5UserManager, CookieAuthHelper):
"""
External authentification PAS plugin which extracts the user id from HTTP
request header, like REMOTE_USER, openAMid, etc.
@@ -77,7 +77,7 @@ class ERP5ExternalAuthicationPlugin(ERP5
user_id_key = ''
manage_options = (({'label': 'Edit',
- 'action': 'manage_editERP5ExternalAuthicationPluginForm',},
+ 'action': 'manage_editERP5ExternalAuthenticationPluginForm',},
)
+ BasePlugin.manage_options[:]
)
@@ -162,7 +162,7 @@ class ERP5ExternalAuthicationPlugin(ERP5
#Cache Method for best performance
_authenticateCredentials = CachingMethod(
_authenticateCredentials,
- id='ERP5ExternalAuthicationPlugin_authenticateCredentials',
+ id='ERP5ExternalAuthenticationPlugin_authenticateCredentials',
cache_factory='erp5_content_short')
try:
return _authenticateCredentials(login=login)
@@ -170,7 +170,7 @@ class ERP5ExternalAuthicationPlugin(ERP5
return None
except StandardError,e:
#Log standard error
- LOG('ERP5ExternalAuthicationPlugin.authenticateCredentials', PROBLEM, str(e))
+ LOG('ERP5ExternalAuthenticationPlugin.authenticateCredentials', PROBLEM, str(e))
return None
################################
@@ -178,10 +178,10 @@ class ERP5ExternalAuthicationPlugin(ERP5
################################
#'Edit' option form
- manage_editERP5ExternalAuthicationPluginForm = PageTemplateFile(
- 'www/ERP5Security_editERP5ExternalAuthicationPlugin',
+ manage_editERP5ExternalAuthenticationPluginForm = PageTemplateFile(
+ 'www/ERP5Security_editERP5ExternalAuthenticationPlugin',
globals(),
- __name__='manage_editERP5ExternalAuthicationPluginForm' )
+ __name__='manage_editERP5ExternalAuthenticationPluginForm' )
security.declareProtected( ManageUsers, 'manage_editERP5ExternalAuthenticationPlugin' )
def manage_editERP5ExternalAuthenticationPlugin(self, user_id_key, RESPONSE=None):
@@ -198,17 +198,17 @@ class ERP5ExternalAuthicationPlugin(ERP5
if RESPONSE is not None:
if error_message != '':
self.REQUEST.form['manage_tabs_message'] = error_message
- return self.manage_editERP5ExternalAuthicationPluginForm(RESPONSE)
+ return self.manage_editERP5ExternalAuthenticationPluginForm(RESPONSE)
else:
message = "Updated"
- RESPONSE.redirect('%s/manage_editERP5ExternalAuthicationPluginForm'
+ RESPONSE.redirect('%s/manage_editERP5ExternalAuthenticationPluginForm'
'?manage_tabs_message=%s'
% ( self.absolute_url(), message )
)
#List implementation of class
-classImplements(ERP5ExternalAuthicationPlugin,
+classImplements(ERP5ExternalAuthenticationPlugin,
plugins.IAuthenticationPlugin,
plugins.ILoginPasswordHostExtractionPlugin)
-InitializeClass(ERP5ExternalAuthicationPlugin)
+InitializeClass(ERP5ExternalAuthenticationPlugin)
Modified: erp5/trunk/products/ERP5Security/__init__.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Security/__init__.py?rev=40381&r1=40380&r2=40381&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Security/__init__.py [utf8] (original)
+++ erp5/trunk/products/ERP5Security/__init__.py [utf8] Thu Nov 18 15:57:52 2010
@@ -26,7 +26,7 @@ import ERP5GroupManager
import ERP5RoleManager
import ERP5UserFactory
import ERP5KeyAuthPlugin
-import ERP5ExternalAuthicationPlugin
+import ERP5ExternalAuthenticationPlugin
def mergedLocalRoles(object):
"""Returns a merging of object and its ancestors'
@@ -61,7 +61,7 @@ registerMultiPlugin(ERP5GroupManager.ERP
registerMultiPlugin(ERP5RoleManager.ERP5RoleManager.meta_type)
registerMultiPlugin(ERP5UserFactory.ERP5UserFactory.meta_type)
registerMultiPlugin(ERP5KeyAuthPlugin.ERP5KeyAuthPlugin.meta_type)
-registerMultiPlugin(ERP5ExternalAuthicationPlugin.ERP5ExternalAuthicationPlugin.meta_type)
+registerMultiPlugin(ERP5ExternalAuthenticationPlugin.ERP5ExternalAuthenticationPlugin.meta_type)
def initialize(context):
@@ -110,11 +110,11 @@ def initialize(context):
, icon='www/portal.gif'
)
- context.registerClass( ERP5ExternalAuthicationPlugin.ERP5ExternalAuthicationPlugin
+ context.registerClass( ERP5ExternalAuthenticationPlugin.ERP5ExternalAuthenticationPlugin
, permission=ManageUsers
, constructors=(
- ERP5ExternalAuthicationPlugin.manage_addERP5ExternalAuthicationPluginForm,
- ERP5ExternalAuthicationPlugin.addERP5ExternalAuthicationPlugin, )
+ ERP5ExternalAuthenticationPlugin.manage_addERP5ExternalAuthenticationPluginForm,
+ ERP5ExternalAuthenticationPlugin.addERP5ExternalAuthenticationPlugin, )
, visibility=None
, icon='www/portal.gif'
)
Modified: erp5/trunk/products/ERP5Security/tests/testERP5Security.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Security/tests/testERP5Security.py?rev=40381&r1=40380&r2=40381&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Security/tests/testERP5Security.py [utf8] (original)
+++ erp5/trunk/products/ERP5Security/tests/testERP5Security.py [utf8] Thu Nov 18 15:57:52 2010
@@ -723,7 +723,7 @@ class TestLocalRoleManagement(ERP5TypeTe
self.assertEqual(response.getStatus(), 200)
self.assertTrue(reference in response.getBody())
- def testERP5ExternalAuthicationPlugin(self):
+ def testERP5ExternalAuthenticationPlugin(self):
"""
Make sure that we can grant security using a ERP5 External Authentication Plugin.
"""
@@ -731,7 +731,7 @@ class TestLocalRoleManagement(ERP5TypeTe
# add key authentication PAS plugin
portal = self.portal
uf = portal.acl_users
- uf.manage_addProduct['ERP5Security'].addERP5ExternalAuthicationPlugin(
+ uf.manage_addProduct['ERP5Security'].addERP5ExternalAuthenticationPlugin(
id='erp5_external_authentication_plugin', \
title='ERP5 External Authentication Plugin',\
user_id_key=user_id_key,)
Modified: erp5/trunk/products/ERP5Security/www/ERP5Security_addERP5ExternalAuthenticationPlugin.zpt
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Security/www/ERP5Security_addERP5ExternalAuthenticationPlugin.zpt?rev=40381&r1=40380&r2=40381&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Security/www/ERP5Security_addERP5ExternalAuthenticationPlugin.zpt [utf8] (original)
+++ erp5/trunk/products/ERP5Security/www/ERP5Security_addERP5ExternalAuthenticationPlugin.zpt [utf8] Thu Nov 18 15:57:52 2010
@@ -4,7 +4,7 @@
<p class="form-help">Please input the configuration</p>
-<form action="addERP5ExternalAuthicationPlugin" method="POST">
+<form action="addERP5ExternalAuthenticationPlugin" method="POST">
<table cellspacing="0" cellpadding="2" border="0">
<tr>
<td align="left" valign="top">
More information about the Erp5-report
mailing list