[Erp5-report] r43542 ivan - in /erp5/trunk/bt5/erp5_egov: ExtensionTemplateItem/ bt/

[nobody at svn.erp5.org]

Author: ivan
Date: Tue Feb 22 09:47:01 2011
New Revision: 43542

URL: http://svn.erp5.org?rev=43542&view=rev
Log:
Use Zope 2.12 style of calling factory (i.e. importing directly).

Modified:
    erp5/trunk/bt5/erp5_egov/ExtensionTemplateItem/SetUpEGovInstance.py
    erp5/trunk/bt5/erp5_egov/bt/revision

Modified: erp5/trunk/bt5/erp5_egov/ExtensionTemplateItem/SetUpEGovInstance.py
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/ExtensionTemplateItem/SetUpEGovInstance.py?rev=43542&r1=43541&r2=43542&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/ExtensionTemplateItem/SetUpEGovInstance.py [utf8] (original)
+++ erp5/trunk/bt5/erp5_egov/ExtensionTemplateItem/SetUpEGovInstance.py [utf8] Tue Feb 22 09:47:01 2011
@@ -32,6 +32,8 @@ from Testing import ZopeTestCase
 from Products import ERP5Security
 from Products import PluggableAuthService
 from zLOG import LOG, WARNING, INFO
+from Products.ERP5eGovSecurity.EGOVUserManager import addEGOVUserManager
+from Products.ERP5eGovSecurity.EGOVGroupManager import addEGOVGroupManager
 
 def allowAccessOnContributionRegistryPortalTypes(self):
   ''' Set Type Acquire Local Role '''
@@ -97,7 +99,7 @@ def enableEgovProcedureLogin(self, porta
 
 def setUpEGovSecurityManager(self):
   '''use safi PAS to be able to login organisation'''
-
+  
   portal = self.getPortalObject()
   acl_users = portal.acl_users
 
@@ -107,10 +109,12 @@ def setUpEGovSecurityManager(self):
   # don't add it if it's already here
   if {'meta_type': 'EGOV User Manager', 'id': 'egov_users'} not in \
       erp5security_dispatcher._d._objects:
-    erp5security_dispatcher.addEGOVUserManager('egov_users')
+    addEGOVUserManager(erp5security_dispatcher, 'egov_users')
+
   if {'meta_type': 'EGOV Group Manager', 'id': 'egov_groups'} not in \
       erp5security_dispatcher._d._objects :
-    erp5security_dispatcher.addEGOVGroupManager('egov_groups')
+    addEGOVGroupManager(erp5security_dispatcher, 'egov_groups')
+    
   # Register ERP5UserManager Interface
   acl_users.egov_users.manage_activateInterfaces(('IAuthenticationPlugin',
                                                   'IUserEnumerationPlugin',))

Modified: erp5/trunk/bt5/erp5_egov/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/bt/revision?rev=43542&r1=43541&r2=43542&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_egov/bt/revision [utf8] Tue Feb 22 09:47:01 2011
@@ -1 +1 @@
-747
\ No newline at end of file
+748