[Erp5-report] r24515 - in /erp5/trunk/bt5/erp5_base: WorkflowTemplateItem/portal_workflow/d...

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Thu Nov  6 21:58:42 2008
New Revision: 24515

URL: http://svn.erp5.org?rev=24515&view=rev
Log:
2008-11-06 Kazuhiko
* accept missing parameters in solveDivergence(). (r24508 was not correct)

Modified:
    erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/scripts/Delivery_solveDivergence.xml
    erp5/trunk/bt5/erp5_base/bt/revision

Modified: erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/scripts/Delivery_solveDivergence.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/scripts/Delivery_solveDivergence.xml?rev=24515&r1=24514&r2=24515&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/scripts/Delivery_solveDivergence.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/scripts/Delivery_solveDivergence.xml [utf8] Thu Nov  6 21:58:42 2008
@@ -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 @@
                             <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>

Modified: erp5/trunk/bt5/erp5_base/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/bt/revision?rev=24515&r1=24514&r2=24515&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/bt/revision [utf8] Thu Nov  6 21:58:42 2008
@@ -1,1 +1,1 @@
-467
+468