[Erp5-report] r13453 - /erp5/trunk/products/ERP5/Document/Order.py

[nobody at svn.erp5.org]

Author: romain
Date: Fri Mar 16 13:26:16 2007
New Revision: 13453

URL: http://svn.erp5.org?rev=13453&view=rev
Log:
Expand Order in activity.

Modified:
    erp5/trunk/products/ERP5/Document/Order.py

Modified: erp5/trunk/products/ERP5/Document/Order.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/Order.py?rev=13453&r1=13452&r2=13453&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Order.py (original)
+++ erp5/trunk/products/ERP5/Document/Order.py Fri Mar 16 13:26:16 2007
@@ -149,22 +149,16 @@
       """
       Reindex children and simulation
       """
-      # XXX Fixme: recursiveReindexObject is called during object creation
-      # It makes object creation slow, because it calls the catalog each time
-      # Now the applied rule is expanded
       Delivery.recursiveReindexObject(self, activate_kw=activate_kw, *k, **kw)
-      self.expandAppliedRuleRelatedToOrder(activate_kw=activate_kw, **kw)
+      self.activate(activate_kw=activate_kw).\
+          expandAppliedRuleRelatedToOrder(activate_kw=activate_kw, **kw)
 
     def expandAppliedRuleRelatedToOrder(self, activate_kw=None,**kw):
       """
       Expand the applied rule related 
       """
-      applied_rule = None
-      # XXX getCausalityRelatedValueList can use portal_type parameter
-      order_causality_list = self.getCausalityRelatedValueList()
-      for order_causality in order_causality_list:
-        if order_causality.getPortalType() == 'Applied Rule':
-          applied_rule = order_causality
-      if applied_rule is not None:
+      applied_rule_list = self.getCausalityRelatedValueList(
+                                           portal_type='Applied Rule')
+      for applied_rule in applied_rule_list:
         # XXX Missing activate keys
         applied_rule.activate(activate_kw=activate_kw).expand(**kw)