[Erp5-report] r31436 kazuhiko - in /erp5/trunk/products/ERP5: Document/ mixin/

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Wed Dec 23 13:46:31 2009
New Revision: 31436

URL: http://svn.erp5.org?rev=31436&view=rev
Log:
generateHashKey should use recorded value if exists.

Modified:
    erp5/trunk/products/ERP5/Document/CategoryMembershipDivergenceTester.py
    erp5/trunk/products/ERP5/mixin/divergence_tester.py

Modified: erp5/trunk/products/ERP5/Document/CategoryMembershipDivergenceTester.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/CategoryMembershipDivergenceTester.py?rev=31436&r1=31435&r2=31436&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/CategoryMembershipDivergenceTester.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/CategoryMembershipDivergenceTester.py [utf8] Wed Dec 23 13:46:31 2009
@@ -92,8 +92,12 @@
     If decision_movement is a simulation movement, use
     the recorded properties instead of the native ones.
     """
-    return '%s/%s/%r' % (self.getPortalType(), self.getTestedProperty(),
-                         movement.getPropertyList(self.getTestedProperty()))
+    tested_property = self.getTestedProperty()
+    if movement.isPropertyRecorded(tested_property):
+      value = movement.getRecordedProperty(tested_property)
+    else:
+      value = movement.getPropertyList(tested_property)
+    return '%s/%s/%r' % (self.getPortalType(), tested_property, value)
 
   def getUpdatablePropertyDict(self, prevision_movement, decision_movement):
     """

Modified: erp5/trunk/products/ERP5/mixin/divergence_tester.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/mixin/divergence_tester.py?rev=31436&r1=31435&r2=31436&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/mixin/divergence_tester.py [utf8] (original)
+++ erp5/trunk/products/ERP5/mixin/divergence_tester.py [utf8] Wed Dec 23 13:46:31 2009
@@ -101,8 +101,11 @@
     the recorded properties instead of the native ones.
     """
     tested_property = self.getTestedProperty()
-    return '%s/%s/%r' % (self.getPortalType(), tested_property,
-                         movement.getProperty(tested_property))
+    if movement.isPropertyRecorded(tested_property):
+      value = movement.getRecordedProperty(tested_property)
+    else:
+      value = movement.getProperty(tested_property)
+    return '%s/%s/%r' % (self.getPortalType(), tested_property, value)
 
   def compare(self, prevision_movement, decision_movement):
     """