From 3dba7cf0612bb156d140bc6688e0d35be34d6e00 Mon Sep 17 00:00:00 2001
From: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date: Thu, 6 Nov 2008 20:58:42 +0000
Subject: [PATCH] 2008-11-06 Kazuhiko * accept missing parameters in
 solveDivergence(). (r24508 was not correct)

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@24515 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../scripts/Delivery_solveDivergence.xml                  | 8 ++++----
 bt5/erp5_base/bt/revision                                 | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/scripts/Delivery_solveDivergence.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/scripts/Delivery_solveDivergence.xml
index a4a9ff0873..e77ba0fcc9 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/scripts/Delivery_solveDivergence.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/scripts/Delivery_solveDivergence.xml
@@ -54,9 +54,9 @@
         <item>
             <key> <string>_body</string> </key>
             <value> <string>delivery = state_change[\'object\']\n
-delivery_solve_property_dict = state_change[\'kwargs\'][\'delivery_solve_property_dict\'] or {}\n
-divergence_to_accept_list = state_change[\'kwargs\'][\'divergence_to_accept_list\'] or []\n
-divergence_to_adopt_list = state_change[\'kwargs\'][\'divergence_to_adopt_list\'] or []\n
+delivery_solve_property_dict = state_change[\'kwargs\'].get(\'delivery_solve_property_dict\', {})\n
+divergence_to_accept_list = state_change[\'kwargs\'].get(\'divergence_to_accept_list\', [])\n
+divergence_to_adopt_list = state_change[\'kwargs\'].get(\'divergence_to_adopt_list\', [])\n
 \n
 if len(delivery_solve_property_dict) or len(divergence_to_accept_list) \\\n
     or len(divergence_to_adopt_list):\n
@@ -111,11 +111,11 @@ delivery.activate().updateCausalityState()\n
                             <string>state_change</string>
                             <string>_getitem_</string>
                             <string>delivery</string>
+                            <string>_getattr_</string>
                             <string>delivery_solve_property_dict</string>
                             <string>divergence_to_accept_list</string>
                             <string>divergence_to_adopt_list</string>
                             <string>len</string>
-                            <string>_getattr_</string>
                             <string>delivery_relative_url</string>
                             <string>delivery_builder_list</string>
                             <string>_getiter_</string>
diff --git a/bt5/erp5_base/bt/revision b/bt5/erp5_base/bt/revision
index 02416eb97c..4c9bbbfa9a 100644
--- a/bt5/erp5_base/bt/revision
+++ b/bt5/erp5_base/bt/revision
@@ -1 +1 @@
-467
\ No newline at end of file
+468
\ No newline at end of file
-- 
2.30.9