[Erp5-report] r39709 jm - in /erp5/trunk: bt5/erp5_egov/DocumentTemplateItem/ bt5/erp5_egov...

[nobody at svn.erp5.org]

Author: jm
Date: Fri Oct 29 18:44:19 2010
New Revision: 39709

URL: http://svn.erp5.org?rev=39709&view=rev
Log:
Fix testERP5eGov

Modified:
    erp5/trunk/bt5/erp5_egov/DocumentTemplateItem/EGovTypeInformation.py
    erp5/trunk/bt5/erp5_egov/ExtensionTemplateItem/SetUpEGovInstance.py
    erp5/trunk/bt5/erp5_egov/bt/revision
    erp5/trunk/products/ERP5Type/Utils.py

Modified: erp5/trunk/bt5/erp5_egov/DocumentTemplateItem/EGovTypeInformation.py
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/DocumentTemplateItem/EGovTypeInformation.py?rev=39709&r1=39708&r2=39709&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/DocumentTemplateItem/EGovTypeInformation.py [utf8] (original)
+++ erp5/trunk/bt5/erp5_egov/DocumentTemplateItem/EGovTypeInformation.py [utf8] Fri Oct 29 18:44:19 2010
@@ -29,7 +29,7 @@ from Globals import InitializeClass
 from AccessControl import ClassSecurityInfo
 from Products.CMFCore.utils import getToolByName
 from Products.ERP5Type import Permissions, PropertySheet, Constraint
-from Products.ERP5Type.Document.PDFTypeInformation import PDFTypeInformation
+from Products.ERP5.Document.PDFTypeInformation import PDFTypeInformation
 from Products.ERP5Type.Core.ActionInformation import CacheableAction
 
 #line count in pdf form of procedure hosting request

Modified: erp5/trunk/bt5/erp5_egov/ExtensionTemplateItem/SetUpEGovInstance.py
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/ExtensionTemplateItem/SetUpEGovInstance.py?rev=39709&r1=39708&r2=39709&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/ExtensionTemplateItem/SetUpEGovInstance.py [utf8] (original)
+++ erp5/trunk/bt5/erp5_egov/ExtensionTemplateItem/SetUpEGovInstance.py [utf8] Fri Oct 29 18:44:19 2010
@@ -52,16 +52,10 @@ def allowAccessOnContributionRegistryPor
 def allowAccessOnPersonAndOrganisation(self):
   '''Add local role on person and organisation to give
      administrative agent access.
-   '''
-
-  self.portal = self.getPortalObject()
-  person_portal_type = self.portal.portal_types.getTypeInfo('Person')
-  person_module_portal_type = self.portal.portal_types.getTypeInfo('Person Module')
-  organisation_portal_type = self.portal.portal_types.getTypeInfo('Organisation')
-  organisation_module_portal_type = self.portal.portal_types.getTypeInfo('Organisation Module')
+  '''
+  portal_type_list = map(self.getPortalObject().portal_types.getTypeInfo,
+    ('Person', 'Person Module', 'Organisation', 'Organisation Module'))
 
-  portal_type_list = (person_portal_type, person_module_portal_type, organisation_portal_type, \
-                      organisation_module_portal_type)
   role_category_list = ['role/gouvernement']
   for ptype in portal_type_list:
     role_info_list=[role_info.getTitle() for role_info in ptype.contentValues(portal_type='Role Information')]
@@ -81,10 +75,8 @@ def enableEgovProcedureLogin(self, porta
   and subcription forms (citizen, company, agent)
   '''
   portal = self.getPortalObject()
+  acl_users = portal.acl_users
 
-  def getAclUsers(self):
-    return getattr(self.getPortalObject(), 'acl_users', None)
-  acl_users = getAclUsers(self)
   erp5security_dispatcher = acl_users.manage_addProduct['ERP5eGovSecurity']
   # add the portal_type in Egov portal_type_list
   if {'meta_type': 'EGOV User Manager', 'id': 'egov_users'} in \
@@ -106,11 +98,7 @@ def setUpEGovSecurityManager(self):
   '''use safi PAS to be able to login organisation'''
 
   portal = self.getPortalObject()
-
-  def getAclUsers(self):
-    return getattr(self.getPortalObject(), 'acl_users', None)
-
-  acl_users = getAclUsers(self)
+  acl_users = portal.acl_users
 
   # Add EGOVUserManager
   ZopeTestCase.installProduct('ERP5eGovSecurity')

Modified: erp5/trunk/bt5/erp5_egov/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/bt/revision?rev=39709&r1=39708&r2=39709&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_egov/bt/revision [utf8] Fri Oct 29 18:44:19 2010
@@ -1 +1 @@
-741
\ No newline at end of file
+742
\ No newline at end of file

Modified: erp5/trunk/products/ERP5Type/Utils.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Utils.py?rev=39709&r1=39708&r2=39709&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Utils.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/Utils.py [utf8] Fri Oct 29 18:44:19 2010
@@ -910,6 +910,7 @@ class PersistentMigrationMixin(object):
       # proceed with migration
       import erp5.portal_type
       klass = getattr(erp5.portal_type, portal_type)
+      assert self.__class__ != klass
       self.__class__ = klass
       self.__setstate__(value)
       LOG('ERP5Type', TRACE, "Migration for object %s" % self)