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

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Wed Mar 24 09:07:32 2010
New Revision: 34037

URL: http://svn.erp5.org?rev=34037&view=rev
Log:
Since r33947, 'solver' value of Simulation Movements is no longer Solver Decision, so we gather divergence message from Solver Decision's 'delivery' values.

Modified:
    erp5/trunk/products/ERP5/Document/SolverDecision.py
    erp5/trunk/products/ERP5/mixin/equivalence_tester.py

Modified: erp5/trunk/products/ERP5/Document/SolverDecision.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/SolverDecision.py?rev=34037&r1=34036&r2=34037&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/SolverDecision.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/SolverDecision.py [utf8] Wed Mar 24 09:07:32 2010
@@ -117,13 +117,17 @@
     Returns the HTML message that describes the detail of divergences to
     be solved with this Solver Decision.
     """
-    simulation_movement_list = self.getSolverRelatedValueList()
+    movement_list = self.getDeliveryValueList()
     message_list = []
     for tester in self.getCausalityValueList():
-      for simulation_movement in simulation_movement_list:
-        if all or len(message_list) == 0:
-          message_list.append(tester.getExplanationMessage(simulation_movement))
-        elif len(message_list) == 1:
-          # XXX it should be a link to the detailed view.
-          message_list.append('...')
+      for movement in movement_list:
+        for simulation_movement in movement.getDeliveryRelatedValueList():
+          message = tester.getExplanationMessage(simulation_movement)
+          if message is None:
+            continue
+          if all or len(message_list) == 0:
+            message_list.append(message)
+          elif len(message_list) == 1:
+            # XXX it should be a link to the detailed view.
+            message_list.append('...')
     return ''.join(message_list)

Modified: erp5/trunk/products/ERP5/mixin/equivalence_tester.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/mixin/equivalence_tester.py?rev=34037&r1=34036&r2=34037&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/mixin/equivalence_tester.py [utf8] (original)
+++ erp5/trunk/products/ERP5/mixin/equivalence_tester.py [utf8] Wed Mar 24 09:07:32 2010
@@ -162,6 +162,8 @@
     divergence.
     """
     divergence_message = self.explain(simulation_movement)
+    if divergence_message is None:
+      return None
     # XXX explanation message should be provided by each class, each
     # portal type or each document.
     message = '<a href="${decision_url}">${property_name} of ${decision_value} of ${decision_type} ${decision_title}</a> of <a href="${delivery_url}">${delivery_title}</a> is different from <a href="${prevision_url}">planned ${property_name} of ${prevision_value}</a>.'