[Erp5-report] r16265 - /erp5/trunk/products/ERP5Type/CopySupport.py

[nobody at svn.erp5.org]

Author: aurel
Date: Tue Sep 11 15:12:25 2007
New Revision: 16265

URL: http://svn.erp5.org?rev=16265&view=rev
Log:
propagate default activate_kw from parent to child objects

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

Modified: erp5/trunk/products/ERP5Type/CopySupport.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/CopySupport.py?rev=16265&r1=16264&r2=16265&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/CopySupport.py (original)
+++ erp5/trunk/products/ERP5Type/CopySupport.py Tue Sep 11 15:12:25 2007
@@ -121,7 +121,7 @@
       if changed != 0:
           object.setCategoryList(category_list)
 
-  def _recursiveSetActivityAfterTag(self, obj):
+  def _recursiveSetActivityAfterTag(self, obj, activate_kw=None):
       """
       Make sure to set an after tag on each object
       so that it is possible to unindex before doing
@@ -129,14 +129,15 @@
       """
       uid = getattr(aq_base(obj), 'uid', None)
       if uid is not None:
-        activate_kw = obj.getDefaultActivateParameterDict()
+        if activate_kw is None:
+          activate_kw = obj.getDefaultActivateParameterDict()
         try:
           activate_kw["after_tag"] = str(uid)
         except TypeError:
           activate_kw = {"after_tag":str(uid),}
         obj.setDefaultActivateParameters(**activate_kw)
       for sub_obj in obj.objectValues():
-        self._recursiveSetActivityAfterTag(sub_obj)
+        self._recursiveSetActivityAfterTag(sub_obj, activate_kw)
 
   security.declareProtected( Permissions.ModifyPortalContent, 'manage_renameObject' )
   def manage_renameObject(self, id=None, new_id=None, REQUEST=None):