[Erp5-report] r13759 - in /erp5/trunk/products/ERP5Type: CopySupport.py Utils.py

[nobody at svn.erp5.org]

Author: yo
Date: Wed Mar 28 16:35:10 2007
New Revision: 13759

URL: http://svn.erp5.org?rev=13759&view=rev
Log:
Use setDefaultActivateParameters instead of _v_activate_kw.

Modified:
    erp5/trunk/products/ERP5Type/CopySupport.py
    erp5/trunk/products/ERP5Type/Utils.py

Modified: erp5/trunk/products/ERP5Type/CopySupport.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/CopySupport.py?rev=13759&r1=13758&r2=13759&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/CopySupport.py (original)
+++ erp5/trunk/products/ERP5Type/CopySupport.py Wed Mar 28 16:35:10 2007
@@ -121,18 +121,17 @@
       if changed != 0:
           object.setCategoryList(category_list)
 
-  def _recursiveSetActivityAfterTag(self,object):
+  def _recursiveSetActivityAfterTag(self, obj):
       """
       Make sure to set an after tag on each object
       so that it is possible to unindex before doing
       indexing, this prevent uid changes
       """
-      uid = getattr(aq_base(object),'uid',None)
+      uid = getattr(aq_base(obj), 'uid', None)
       if uid is not None:
-        activate_kw = {'after_tag': '%s' % uid}
-        object._v_activate_kw = activate_kw
-      for sub_object in object.objectValues():
-          self._recursiveSetActivityAfterTag(sub_object)
+        obj.setDefaultActivateParameters(after_tag = str(uid))
+      for sub_obj in obj.objectValues():
+        self._recursiveSetActivityAfterTag(sub_obj)
 
   security.declareProtected( Permissions.ModifyPortalContent, 'manage_renameObject' )
   def manage_renameObject(self, id=None, new_id=None, REQUEST=None):

Modified: erp5/trunk/products/ERP5Type/Utils.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Utils.py?rev=13759&r1=13758&r2=13759&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Utils.py (original)
+++ erp5/trunk/products/ERP5Type/Utils.py Wed Mar 28 16:35:10 2007
@@ -333,7 +333,7 @@
                  activate_kw=None, is_indexable=None, **kw):
       o = self.klass(id)
       if activate_kw is not None:
-        o._v_activate_kw = activate_kw
+        o.setDefaultActivateParameters(**activate_kw)
       if is_indexable is not None:
         o.isIndexable = is_indexable
       folder._setObject(id, o)