[Erp5-report] r36882 kazuhiko - in /erp5/trunk/products/ERP5: Document/ PropertySheet/

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Tue Jul  6 09:38:24 2010
New Revision: 36882

URL: http://svn.erp5.org?rev=36882&view=rev
Log:
rewrite SolverDecision.searchDeliverySolverList() to use target solver portal type's delivery_solver list.

Modified:
    erp5/trunk/products/ERP5/Document/SolverDecision.py
    erp5/trunk/products/ERP5/PropertySheet/SolverType.py

Modified: erp5/trunk/products/ERP5/Document/SolverDecision.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/SolverDecision.py?rev=36882&r1=36881&r2=36882&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/SolverDecision.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/SolverDecision.py [utf8] Tue Jul  6 09:38:24 2010
@@ -118,11 +118,11 @@ class SolverDecision(ConfigurableMixin, 
     this method returns a list of delivery solvers, as predicates against
     solver decision.
     """
-    portal = self.getPortalObject()
-    portal_type_list = portal.getPortalDeliverySolverTypeList()
-    portal_solvers = portal.portal_solvers
-    return filter(lambda x:x.test(self),
-                  [getattr(portal_solvers, x) for x in portal_type_list])
+    target_solver_type = self.getSolverValue()
+    if target_solver_type is None:
+      return []
+    solver_list = target_solver_type.getDeliverySolverValueList()
+    return filter(lambda x:x.test(self), solver_list)
 
   def getExplanationMessage(self, all=False):
     """

Modified: erp5/trunk/products/ERP5/PropertySheet/SolverType.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/PropertySheet/SolverType.py?rev=36882&r1=36881&r2=36882&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/PropertySheet/SolverType.py [utf8] (original)
+++ erp5/trunk/products/ERP5/PropertySheet/SolverType.py [utf8] Tue Jul  6 09:38:24 2010
@@ -85,4 +85,4 @@ class SolverType:
          },
     )
 
-    _categories = ('conflicting_solver',)
+    _categories = ('conflicting_solver', 'delivery_solver',)