[Erp5-report] r36370 kazuhiko - in /erp5/trunk/products/ERP5: Document/ Interactor/

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Tue Jun 15 22:20:33 2010
New Revision: 36370

URL: http://svn.erp5.org?rev=36370&view=rev
Log:
* calling parent's recursiveReindexObject() by reindexObject() is not at all scalable, and parent's _reindexObject() is enough here.
* implement by Interactor instead of overriding reindexObject().

Added:
    erp5/trunk/products/ERP5/Interactor/InventoryInteractor.py
Modified:
    erp5/trunk/products/ERP5/Document/InventoryCell.py
    erp5/trunk/products/ERP5/Document/InventoryLine.py

Modified: erp5/trunk/products/ERP5/Document/InventoryCell.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/InventoryCell.py?rev=36370&r1=36369&r2=36370&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/InventoryCell.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/InventoryCell.py [utf8] Tue Jun 15 22:20:33 2010
@@ -100,9 +100,3 @@ class InventoryCell(DeliveryCell):
         no inventory was defined.
       """
       return self.getInventory() # XXX quantity unit is missing
-
-    def reindexObject(self, *args, **kw):
-      """
-      Make sure to reindex the inventory
-      """
-      self.getParentValue().reindexObject(*args, **kw)

Modified: erp5/trunk/products/ERP5/Document/InventoryLine.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/InventoryLine.py?rev=36370&r1=36369&r2=36370&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/InventoryLine.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/InventoryLine.py [utf8] Tue Jun 15 22:20:33 2010
@@ -121,10 +121,3 @@ class InventoryLine(DeliveryLine):
         Take into account efficiency in converted target quantity
       """
       return Movement.getInventoriatedQuantity(self)
-
-    def reindexObject(self, *args, **kw):
-      """
-      Make sure to reindex the inventory
-      """
-      self.getParentValue().recursiveReindexObject(*args, **kw)
-

Added: erp5/trunk/products/ERP5/Interactor/InventoryInteractor.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Interactor/InventoryInteractor.py?rev=36370&view=auto
==============================================================================
--- erp5/trunk/products/ERP5/Interactor/InventoryInteractor.py (added)
+++ erp5/trunk/products/ERP5/Interactor/InventoryInteractor.py [utf8] Tue Jun 15 22:20:33 2010
@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2010 Nexedi SA and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+
+from Products.ERP5Type.Interactor.Interactor import Interactor
+
+class InventoryInteractor(Interactor):
+  """
+  This interactor invokes reindex on Inventory document when its
+  subdocuments are modified.
+  """
+  def install(self):
+    from Products.ERP5Type.Document.InventoryLine import InventoryLine
+    self.on(InventoryLine.reindexObject).doAfter(self.reindexInventory)
+    from Products.ERP5Type.Document.InventoryCell import InventoryCell
+    self.on(InventoryCell.reindexObject).doAfter(self.reindexInventory)
+
+  def reindexInventory(self, method_call_object, *args, **kw):
+    """
+      Reset _aq_dynamic
+    """
+    inventory = method_call_object.instance.getDeliveryValue()
+    # No need to reindex recursively, so we call _reindexObject() not
+    # reindexObject() that is defined in Delivery.py as recursiveReindexObject().
+    inventory._reindexObject(**method_call_object.kw)