diff --git a/product/ERP5/ERP5Site.py b/product/ERP5/ERP5Site.py index 228ac4b4ee60126463a7cf151e851d98ed095e19..6d22517644b0e0e0310783618304acd2112a7acf 100644 --- a/product/ERP5/ERP5Site.py +++ b/product/ERP5/ERP5Site.py @@ -1528,15 +1528,6 @@ class ERP5Site(FolderMixIn, CMFSite, CacheCookieMixin): key = ('default_reindex_parameter', ) tv[key] = kw - security.declarePublic('setPlacelessDefaultActivateParameters') - def setPlacelessDefaultActivateParameters(self, **kw): - # This method sets the default keyword parameters to activate. This is useful - # when you need to specify special parameters implicitly (e.g. to reindexObject). - # Those parameters will affect all activate calls, not just ones on self. - tv = getTransactionalVariable() - key = ('default_activate_parameter', ) - tv[key] = kw - security.declarePublic('getPlacelessDefaultReindexParameters') def getPlacelessDefaultReindexParameters(self): # This method returns default reindex parameters to self. @@ -1545,14 +1536,6 @@ class ERP5Site(FolderMixIn, CMFSite, CacheCookieMixin): key = ('default_reindex_parameter', ) return tv.get(key) - security.declarePublic('getPlacelessDefaultActivateParameters') - def getPlacelessDefaultActivateParameters(self): - # This method returns default activate parameters to self. - # The result can be either a dict object or None. - tv = getTransactionalVariable() - key = ('default_activate_parameter', ) - return tv.get(key) - security.declareProtected(Permissions.ManagePortal, 'getERP5SiteGlobalId') def getERP5SiteGlobalId(self): """Returns site global ID without any fallback""" diff --git a/product/ERP5Type/Core/Folder.py b/product/ERP5Type/Core/Folder.py index b9be2080d675c0eb9330b21722c0e46a5fdf75fe..6a26bd6ea051d7a44b9934768d170074641d0838 100644 --- a/product/ERP5Type/Core/Folder.py +++ b/product/ERP5Type/Core/Folder.py @@ -373,15 +373,10 @@ class FolderMixIn(ExtensionClass.Base): In order to activate objects that don't inherit ActiveObject, only placeless default activate parameters are taken into account. """ - portal = self.getPortalObject() - activate_kw = portal.getPlacelessDefaultActivateParameters() - if activate_kw: - activate_kw = activate_kw.copy() - else: - activate_kw = {} + activate_kw = self.getDefaultActivateParameterDict.im_func(None) activate_kw.update(kw.get('activate_kw', ())) activate_kw.setdefault('active_process', None) - activate = portal.portal_activities.activateObject + activate = self.getPortalObject().portal_activities.activateObject validate = restricted and getSecurityManager().validate cost = activate_kw.setdefault('group_method_cost', .034) # 30 objects if cost != 1: