From 396630effacc85e649fc0b51e22d1920fba91851 Mon Sep 17 00:00:00 2001
From: Nicolas Delaby <nicolas@nexedi.com>
Date: Tue, 5 Apr 2011 15:08:50 +0000
Subject: [PATCH] Do not override value pass in arguments
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@45097 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
.../erp5_simulation/Delivery_getSolverDecisionList.xml | 3 +++
.../erp5_simulation/Delivery_submitSolveDivergenceDialog.xml | 3 ++-
bt5/erp5_simulation/bt/revision | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_getSolverDecisionList.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_getSolverDecisionList.xml
index cdae1c24f3..81fcbed468 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_getSolverDecisionList.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_getSolverDecisionList.xml
@@ -60,6 +60,9 @@ for i in solver_list:\n
solver_process = i\n
break\n
\n
+if not context.getPortalObject().portal_solver_processes.isDivergent(context):\n
+ return []\n
+\n
if solver_process is None:\n
solver_process = context.getPortalObject().portal_solver_processes.newSolverProcess(context)\n
else:\n
diff --git a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_submitSolveDivergenceDialog.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_submitSolveDivergenceDialog.xml
index 25aa24302a..17e8867abe 100644
--- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_submitSolveDivergenceDialog.xml
+++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_submitSolveDivergenceDialog.xml
@@ -53,7 +53,8 @@
<value> <string>from Products.ERP5Type.Message import translateString\n
\n
request= context.REQUEST\n
-listbox = request.get(\'listbox\')\n
+if not listbox:\n
+ listbox = request.get(\'listbox\', [])\n
line_list = context.Delivery_getSolverDecisionList(listbox=listbox)\n
for listbox_key in listbox:\n
listbox_dict = listbox[listbox_key]\n
diff --git a/bt5/erp5_simulation/bt/revision b/bt5/erp5_simulation/bt/revision
index 4701cc7931..c663e4d093 100644
--- a/bt5/erp5_simulation/bt/revision
+++ b/bt5/erp5_simulation/bt/revision
@@ -1 +1 @@
-150
\ No newline at end of file
+151
\ No newline at end of file
--
2.30.9