[Erp5-report] r38450 fx.algrain - in /experimental/bt5/erp5_credential: ExtensionTemplateIt...
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Sep 17 13:54:08 CEST 2010
Author: fx.algrain
Date: Fri Sep 17 13:54:05 2010
New Revision: 38450
URL: http://svn.erp5.org?rev=38450&view=rev
Log:
The search on login is only for local account. So I rename 'Login' to 'LocalLogin' and propagate the change where it's needed
Added:
experimental/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/ERP5Site_isLocalLoginAvailable.xml
Modified:
experimental/bt5/erp5_credential/ExtensionTemplateItem/Credential.py
experimental/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_checkLoginAvailability.xml
experimental/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_checkLoginExistence.xml
Modified: experimental/bt5/erp5_credential/ExtensionTemplateItem/Credential.py
URL: http://svn.erp5.org/experimental/bt5/erp5_credential/ExtensionTemplateItem/Credential.py?rev=38450&r1=38449&r2=38450&view=diff
==============================================================================
--- experimental/bt5/erp5_credential/ExtensionTemplateItem/Credential.py [utf8] (original)
+++ experimental/bt5/erp5_credential/ExtensionTemplateItem/Credential.py [utf8] Fri Sep 17 13:54:05 2010
@@ -34,22 +34,24 @@ except ImportError:
PluggableAuthService = None
-def isLoginAvailable(self, login):
+def isLocalLoginAvailable(self, login):
"""
- Check for login avaibility, return False if the login is already used,
+ Check for login avaibility with ERP5UserManager, return False if the login is already used,
True instead
"""
if not login:
return False
portal = self.getPortalObject()
acl_users = getToolByName(portal, 'acl_users')
+
if PluggableAuthService is not None and isinstance(acl_users,
PluggableAuthService.PluggableAuthService.PluggableAuthService):
+ #ERP5UserManager implement IUserEnumerationPlugin
plugin_list = acl_users.plugins.listPlugins(
PluggableAuthService.interfaces.plugins.IUserEnumerationPlugin)
for plugin_name, plugin_value in plugin_list:
if isinstance(plugin_value, ERP5UserManager):
- user_list = acl_users.searchUsers(id=login,
+ user_list = plugin_value.enumerateUsers(id=login,
exact_match=True)
if len(user_list) > 0:
return False
Modified: experimental/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_checkLoginAvailability.xml
URL: http://svn.erp5.org/experimental/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_checkLoginAvailability.xml?rev=38450&r1=38449&r2=38450&view=diff
==============================================================================
--- experimental/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_checkLoginAvailability.xml [utf8] (original)
+++ experimental/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_checkLoginAvailability.xml [utf8] Fri Sep 17 13:54:05 2010
@@ -50,7 +50,9 @@
</item>
<item>
<key> <string>_body</string> </key>
- <value> <string>from Products.DCWorkflow.DCWorkflow import ValidationFailed\n
+ <value> <string>"""Check if login is avaible or not"""\n
+\n
+from Products.DCWorkflow.DCWorkflow import ValidationFailed\n
from Products.ERP5Type.Message import translateString\n
reference = request.get(\'field_my_reference\', \n
request.get(\'my_reference\'))\n
@@ -58,7 +60,7 @@ if not reference:\n
reference = request.get(\'field_your_reference\', \n
request.get(\'your_reference\'))\n
\n
-return context.ERP5Site_isLoginAvailable(reference)\n
+return context.ERP5Site_isLocalLoginAvailable(reference)\n
</string> </value>
</item>
<item>
Modified: experimental/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_checkLoginExistence.xml
URL: http://svn.erp5.org/experimental/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_checkLoginExistence.xml?rev=38450&r1=38449&r2=38450&view=diff
==============================================================================
--- experimental/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_checkLoginExistence.xml [utf8] (original)
+++ experimental/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_checkLoginExistence.xml [utf8] Fri Sep 17 13:54:05 2010
@@ -50,15 +50,8 @@
</item>
<item>
<key> <string>_body</string> </key>
- <value> <string>from Products.DCWorkflow.DCWorkflow import ValidationFailed\n
-from Products.ERP5Type.Message import translateString\n
-reference = request.get(\'field_my_reference\', \n
- request.get(\'my_reference\'))\n
-if not reference:\n
- reference = request.get(\'field_your_reference\', \n
- request.get(\'your_reference\'))\n
-\n
-return not context.ERP5Site_isLoginAvailable(reference)\n
+ <value> <string>"""Check if login exist or not. It\'s the inverse of avaibility"""\n
+return not context.ERP5Site_isLocalLoginAvailable(editor,request)\n
</string> </value>
</item>
<item>
@@ -105,12 +98,7 @@ return not context.ERP5Site_isLoginAvail
<tuple>
<string>editor</string>
<string>request</string>
- <string>Products.DCWorkflow.DCWorkflow</string>
- <string>ValidationFailed</string>
- <string>Products.ERP5Type.Message</string>
- <string>translateString</string>
<string>_getattr_</string>
- <string>reference</string>
<string>context</string>
</tuple>
</value>
Added: experimental/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/ERP5Site_isLocalLoginAvailable.xml
URL: http://svn.erp5.org/experimental/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/ERP5Site_isLocalLoginAvailable.xml?rev=38450&view=auto
==============================================================================
--- experimental/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/ERP5Site_isLocalLoginAvailable.xml (added)
+++ experimental/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/ERP5Site_isLocalLoginAvailable.xml [utf8] Fri Sep 17 13:54:05 2010
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <global name="ExternalMethod" module="Products.ExternalMethod.ExternalMethod"/>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_function</string> </key>
+ <value> <string>isLocalLoginAvailable</string> </value>
+ </item>
+ <item>
+ <key> <string>_module</string> </key>
+ <value> <string>Credential</string> </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>ERP5Site_isLocalLoginAvailable</string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
More information about the Erp5-report
mailing list