From 638ee29ec28aca80f24a79b4b9d1545965e8c794 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com>
Date: Mon, 10 May 2010 17:04:08 +0000
Subject: [PATCH] get solver tool from its new location, and minor updates
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@35147 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
product/ERP5/Document/SolverProcess.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/product/ERP5/Document/SolverProcess.py b/product/ERP5/Document/SolverProcess.py
index a7f15e70a2..c51ac84ce6 100644
--- a/product/ERP5/Document/SolverProcess.py
+++ b/product/ERP5/Document/SolverProcess.py
@@ -81,7 +81,6 @@ class SolverProcess(XMLObject, ActiveProcess):
Builds target solvers from solver decisions
"""
movement_dict = {}
- types_tool = self.portal_types
message_list = []
# First create a mapping between delivery movements and solvers
@@ -154,8 +153,9 @@ class SolverProcess(XMLObject, ActiveProcess):
if configuration_mapping not in movement_solver_configuration_list:
movement_solver_configuration_list.append(configuration_mapping)
- # Return empty list of conflicts
- if message_list: return message_list
+ # If conflicts where detected, return them and do nothing
+ if message_list:
+ return message_list
# Fourth, build target solvers
for solver, solver_key_dict in grouped_solver_dict.items():
@@ -216,7 +216,7 @@ class SolverProcess(XMLObject, ActiveProcess):
# delivery lines. Let us group decisions in such way
# that a single decision is created per divergence tester instance
# and per application level list
- solver_tool = self.getParentValue()
+ solver_tool = self.getPortalObject().portal_solvers
solver_decision_dict = {}
for movement in movement_list:
for simulation_movement in movement.getDeliveryRelatedValueList():
--
2.30.9