[Erp5-report] r12682 - in /erp5/trunk/products: ERP5/Document/ ERP5Type/Core/

[nobody at svn.erp5.org]

Author: vincent
Date: Wed Feb 14 09:59:57 2007
New Revision: 12682

URL: http://svn.erp5.org?rev=12682&view=rev
Log:
Add an activate_kw argument to separate activate() parameters from activated function parameters.

Modified:
    erp5/trunk/products/ERP5/Document/Order.py
    erp5/trunk/products/ERP5/Document/OrderCell.py
    erp5/trunk/products/ERP5/Document/OrderLine.py
    erp5/trunk/products/ERP5Type/Core/Folder.py

Modified: erp5/trunk/products/ERP5/Document/Order.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/Order.py?rev=12682&r1=12681&r2=12682&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Order.py (original)
+++ erp5/trunk/products/ERP5/Document/Order.py Wed Feb 14 09:59:57 2007
@@ -150,7 +150,7 @@
       Reindex children and simulation
       """
       # Now the applied rule is expanded
-      Delivery.recursiveReindexObject(self, *k, **kw)
+      Delivery.recursiveReindexObject(self, activate_kw=activate_kw, *k, **kw)
       self.expandAppliedRuleRelatedToOrder(activate_kw=activate_kw, **kw)
 
     def expandAppliedRuleRelatedToOrder(self, activate_kw=None,**kw):

Modified: erp5/trunk/products/ERP5/Document/OrderCell.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/OrderCell.py?rev=12682&r1=12681&r2=12682&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/OrderCell.py (original)
+++ erp5/trunk/products/ERP5/Document/OrderCell.py Wed Feb 14 09:59:57 2007
@@ -76,9 +76,9 @@
       self.recursiveReindexObject(*k,**kw)
 
     security.declarePublic('recursiveReindexObject')
-    def recursiveReindexObject(self, *k, **kw):
+    def recursiveReindexObject(self, activate_kw={}, *k, **kw):
       """
       Reindex children and simulation
       """
-      self.getExplanationValue().expandAppliedRuleRelatedToOrder(**kw)
-      DeliveryCell.recursiveReindexObject(self, *k, **kw)
+      self.getExplanationValue().expandAppliedRuleRelatedToOrder(activate_kw=activate_kw, **kw)
+      DeliveryCell.recursiveReindexObject(self, activate_kw=activate_kw, *k, **kw)

Modified: erp5/trunk/products/ERP5/Document/OrderLine.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/OrderLine.py?rev=12682&r1=12681&r2=12682&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/OrderLine.py (original)
+++ erp5/trunk/products/ERP5/Document/OrderLine.py Wed Feb 14 09:59:57 2007
@@ -79,12 +79,12 @@
           getattr(my_simulation_movement, method_id)()
     
     security.declarePublic('recursiveReindexObject')    
-    def recursiveReindexObject(self, *k, **kw):
+    def recursiveReindexObject(self, activate_kw={}, *k, **kw):
       """
         Reindex children and simulation
       """
-      self.getExplanationValue().expandAppliedRuleRelatedToOrder(**kw)
-      DeliveryLine.recursiveReindexObject(self, *k, **kw)
+      self.getExplanationValue().expandAppliedRuleRelatedToOrder(activate_kw=activate_kw, **kw)
+      DeliveryLine.recursiveReindexObject(self, activate_kw=activate_kw, *k, **kw)
       #self.activate().applyToOrderLineRelatedMovement(method_id = 'expand')
       # We do it at Order level through edit
       # This logic should actually be put in worklow

Modified: erp5/trunk/products/ERP5Type/Core/Folder.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Core/Folder.py?rev=12682&r1=12681&r2=12682&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Core/Folder.py (original)
+++ erp5/trunk/products/ERP5Type/Core/Folder.py Wed Feb 14 09:59:57 2007
@@ -528,14 +528,14 @@
     self.recursiveReindexObject()
 
   security.declarePublic( 'recursiveReindexObject' )
-  def recursiveReindexObject(self, *args, **kw):
+  def recursiveReindexObject(self, activate_kw={}, *args, **kw):
     """
       Fixes the hierarchy structure (use of Base class)
       XXXXXXXXXXXXXXXXXXXXXXXX
       BUG here : when creating a new base category
     """
     if self.isIndexable:
-      self.activate(group_method_id='portal_catalog/catalogObjectList', expand_method_id='getIndexableChildValueList', alternate_method_id='alternateReindexObject', **kw).recursiveImmediateReindexObject(*args, **kw)
+      self.activate(group_method_id='portal_catalog/catalogObjectList', expand_method_id='getIndexableChildValueList', alternate_method_id='alternateReindexObject', **activate_kw).recursiveImmediateReindexObject(*args, **kw)
 
   security.declareProtected( Permissions.AccessContentsInformation, 'getIndexableChildValueList' )
   def getIndexableChildValueList(self):