diff --git a/product/CMFActivity/ActiveObject.py b/product/CMFActivity/ActiveObject.py index 5466d6ac5f5593379d7a132f82b95c0cb34ae70b..4deafdc57c4338bcdca71a249329bcea427e840c 100644 --- a/product/CMFActivity/ActiveObject.py +++ b/product/CMFActivity/ActiveObject.py @@ -103,7 +103,7 @@ class ActiveObject(ExtensionClass.Base): # Get default parameters from a transactional variable. tv = getTransactionalVariable() - key = ('default_activate_parameter', self.getPhysicalPath()) + key = ('default_activate_parameter', id(aq_base(self))) try: for k, v in tv[key].iteritems(): if k not in kw: @@ -194,5 +194,5 @@ class ActiveObject(ExtensionClass.Base): # This method sets the default keyword parameters to activate. This is useful # when you need to specify special parameters implicitly (e.g. to reindexObject). tv = getTransactionalVariable() - key = ('default_activate_parameter', self.getPhysicalPath()) + key = ('default_activate_parameter', id(aq_base(self))) tv[key] = kw \ No newline at end of file diff --git a/product/CMFActivity/ActiveProcess.py b/product/CMFActivity/ActiveProcess.py index 0259429b522ecf5a97e63e4d2ec7d5c22c298cd0..918ce96378c6f33cc6c7618374a66b534a007cd9 100644 --- a/product/CMFActivity/ActiveProcess.py +++ b/product/CMFActivity/ActiveProcess.py @@ -39,18 +39,19 @@ from zLOG import LOG manage_addActiveProcessForm=DTMLFile('dtml/ActiveProcess_add', globals()) -def addActiveProcess( self, id, title='', REQUEST=None, activate_kw=None, **kw): +def addActiveProcess(self, id, title='', REQUEST=None, activate_kw=None, **kw): """ Add a new Category and generate UID by calling the ZSQLCatalog. This code is inspired from Document Constructor in Products.ERP5Type.Utils and should probably be merged. """ - o = ActiveProcess( id ) + o = ActiveProcess(id) if activate_kw is not None: o.setDefaultActivateParameters(**activate_kw) o.uid = self.portal_catalog.newUid() - self._setObject( id, o ) - if kw: o.__of__(folder)._edit(force_update=1, **kw) + self._setObject(id, o) + o = self._getOb(id) + if kw: o._edit(force_update=1, **kw) if REQUEST is not None: REQUEST['RESPONSE'].redirect( 'manage_main' )