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

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Thu Nov  6 15:27:11 2008
New Revision: 24508

URL: http://svn.erp5.org?rev=24508&view=rev
Log:
2008-11-06 Kazuhiko
* allow solve_divergence transition in calculating state (workflow method transiiton only).
* accept missing parameters in solveDivergence().

Modified:
    erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/scripts/Delivery_solveDivergence.xml
    erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/states/calculating.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=24508&r1=24507&r2=24508&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 15:27:11 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\']\n
-divergence_to_accept_list = state_change[\'kwargs\'][\'divergence_to_accept_list\']\n
-divergence_to_adopt_list = state_change[\'kwargs\'][\'divergence_to_adopt_list\']\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
 \n
 if len(delivery_solve_property_dict) or len(divergence_to_accept_list) \\\n
     or len(divergence_to_adopt_list):\n

Modified: erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/states/calculating.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/states/calculating.xml?rev=24508&r1=24507&r2=24508&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/states/calculating.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/states/calculating.xml [utf8] Thu Nov  6 15:27:11 2008
@@ -33,6 +33,7 @@
               <tuple>
                 <string>converge</string>
                 <string>diverge</string>
+                <string>solve_divergence</string>
                 <string>start_building</string>
               </tuple>
             </value>

Modified: erp5/trunk/bt5/erp5_base/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/bt/revision?rev=24508&r1=24507&r2=24508&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/bt/revision [utf8] Thu Nov  6 15:27:11 2008
@@ -1,1 +1,1 @@
-465
+466