Add support for activate_kw in default parameter dict.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@23470 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5Type/Base.py

@@ -2756,6 +2756,13 @@ class Base( CopyContainer,
 
       reindex_kw = self.getDefaultReindexParameterDict()
       if reindex_kw is not None:
+        reindex_activate_kw = reindex_kw.pop('activate_kw', None)
+        if reindex_activate_kw is not None:
+          reindex_activate_kw = reindex_activate_kw.copy()
+          if activate_kw is not None:
+            # activate_kw parameter takes precedence
+            reindex_activate_kw.update(activate_kw)
+          activate_kw = reindex_activate_kw
         kw.update(reindex_kw)
       
       group_id_list  = []

product/ERP5Type/Core/Folder.py

@@ -1107,6 +1107,13 @@ class Folder(CopyContainer, CMFBTreeFolder, CMFHBTreeFolder, Base, FolderMixIn,
 
       reindex_kw = self.getDefaultReindexParameterDict()
       if reindex_kw is not None:
+        reindex_activate_kw = reindex_kw.pop('activate_kw', None)
+        if reindex_activate_kw is not None:
+          reindex_activate_kw = reindex_activate_kw.copy()
+          if activate_kw is not None:
+            # activate_kw parameter takes precedence
+            reindex_activate_kw.update(activate_kw)
+          activate_kw = reindex_activate_kw
         kw.update(reindex_kw)
 
       group_id_list  = []