[Erp5-report] r23470 - in /erp5/trunk/products/ERP5Type: Base.py Core/Folder.py

[nobody at svn.erp5.org]

Author: vincent
Date: Mon Sep  8 07:03:50 2008
New Revision: 23470

URL: http://svn.erp5.org?rev=23470&view=rev
Log:
Add support for activate_kw in default parameter dict.

Modified:
    erp5/trunk/products/ERP5Type/Base.py
    erp5/trunk/products/ERP5Type/Core/Folder.py

Modified: erp5/trunk/products/ERP5Type/Base.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Base.py?rev=23470&r1=23469&r2=23470&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Base.py (original)
+++ erp5/trunk/products/ERP5Type/Base.py Mon Sep  8 07:03:50 2008
@@ -2756,6 +2756,13 @@
 
       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  = []

Modified: erp5/trunk/products/ERP5Type/Core/Folder.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Core/Folder.py?rev=23470&r1=23469&r2=23470&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Core/Folder.py (original)
+++ erp5/trunk/products/ERP5Type/Core/Folder.py Mon Sep  8 07:03:50 2008
@@ -1107,6 +1107,13 @@
 
       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  = []