Commit 1823efe0 authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

use erp5_login_users instead of erp5_users.

parent 16b2077f
...@@ -127,11 +127,11 @@ def setUpEGovSecurityManager(self): ...@@ -127,11 +127,11 @@ def setUpEGovSecurityManager(self):
plugins.deactivatePlugin( interface, 'erp5_groups') plugins.deactivatePlugin( interface, 'erp5_groups')
plugins = acl_users.egov_users.plugins plugins = acl_users.egov_users.plugins
interface = plugins._getInterfaceFromName('IAuthenticationPlugin') interface = plugins._getInterfaceFromName('IAuthenticationPlugin')
if 'erp5_users' in list(plugins._getPlugins(interface)): if 'erp5_login_users' in list(plugins._getPlugins(interface)):
plugins.deactivatePlugin( interface, 'erp5_users') plugins.deactivatePlugin( interface, 'erp5_login_users')
interface = plugins._getInterfaceFromName('IUserEnumerationPlugin') interface = plugins._getInterfaceFromName('IUserEnumerationPlugin')
if 'erp5_users' in list(plugins._getPlugins(interface)): if 'erp5_login_users' in list(plugins._getPlugins(interface)):
plugins.deactivatePlugin( interface, 'erp5_users') plugins.deactivatePlugin( interface, 'erp5_login_users')
# set properties to enable the login on Person and Organisation # set properties to enable the login on Person and Organisation
# and subcription forms (citizen, company, agent) # and subcription forms (citizen, company, agent)
......
...@@ -5,7 +5,7 @@ plugin_id = "nexedi_authentication" ...@@ -5,7 +5,7 @@ plugin_id = "nexedi_authentication"
user_folder = context.getPortalObject().acl_users user_folder = context.getPortalObject().acl_users
user_folder.manage_delObjects('nexedi_authentication') user_folder.manage_delObjects('nexedi_authentication')
erp5_users_plugin = getattr(user_folder, "erp5_users") erp5_login_users_plugin = getattr(user_folder, "erp5_login_users")
erp5_users_plugin.manage_activateInterfaces(interfaces=['IAuthenticationPlugin', 'IUserEnumerationPlugin']) erp5_login_users_plugin.manage_activateInterfaces(interfaces=['IAuthenticationPlugin', 'IUserEnumerationPlugin'])
return True return True
...@@ -107,8 +107,8 @@ class TestERP5RemoteUserManager(ERP5TypeTestCase): ...@@ -107,8 +107,8 @@ class TestERP5RemoteUserManager(ERP5TypeTestCase):
acl_users = self.portal.acl_users acl_users = self.portal.acl_users
addERP5RemoteUserManager(acl_users, self.erp5_remote_manager_id) addERP5RemoteUserManager(acl_users, self.erp5_remote_manager_id)
self.erp5_remote_manager = getattr(acl_users, self.erp5_remote_manager_id) self.erp5_remote_manager = getattr(acl_users, self.erp5_remote_manager_id)
erp5_users = getattr(acl_users, 'erp5_users') erp5_login_users = getattr(acl_users, 'erp5_login_users')
erp5_users.manage_activateInterfaces(['IUserEnumerationPlugin']) erp5_login_users.manage_activateInterfaces(['IUserEnumerationPlugin'])
self.erp5_remote_manager.manage_activateInterfaces(['IAuthenticationPlugin']) self.erp5_remote_manager.manage_activateInterfaces(['IAuthenticationPlugin'])
self.commit() self.commit()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment