[Erp5-report] r31044 jerome - in /erp5/trunk/bt5/erp5_base: WorkflowTemplateItem/portal_wor...

[nobody at svn.erp5.org]

Author: jerome
Date: Thu Dec  3 16:40:36 2009
New Revision: 31044

URL: http://svn.erp5.org?rev=31044&view=rev
Log:
Update causality state even if there's no split movements, otherwise the delivery would be left in calculating state. Also activate updateCausalityState after solving.

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

Modified: erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/scripts/Delivery_splitAndDefer.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/scripts/Delivery_splitAndDefer.xml?rev=31044&r1=31043&r2=31044&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/scripts/Delivery_splitAndDefer.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/scripts/Delivery_splitAndDefer.xml [utf8] Thu Dec  3 16:40:36 2009
@@ -60,6 +60,7 @@
 stop_date = state_change[\'kwargs\'][\'stop_date\']\n
 \n
 if not len(split_movement_list):\n
+  delivery.updateCausalityState()\n
   return\n
 \n
 tag = delivery.getPath() + \'_split\'\n
@@ -72,7 +73,8 @@
     movement, None, \'SplitAndDefer\', start_date=start_date,\n
     stop_date=stop_date, activate_kw={\'tag\':tag})\n
 \n
-delivery.activate().updateCausalityState()\n
+delivery.activate(after_tag=tag).updateCausalityState()\n
+\n
 # Create delivery\n
 explanation_uid_list = []\n
 object = delivery\n
@@ -84,7 +86,7 @@
 for delivery_builder in delivery.getBuilderList():\n
   this_builder_tag = \'%s_split_%s\' % (delivery.getPath(),\n
                                       delivery_builder.getId())\n
-  after_tag = [tag]\n
+  all_tag_list.append(this_builder_tag)\n
   if previous_tag:\n
     after_tag.append(previous_tag)\n
   delivery_builder.activate(activity=\'SQLQueue\',\n
@@ -145,6 +147,7 @@
                             <string>previous_tag</string>
                             <string>delivery_builder</string>
                             <string>this_builder_tag</string>
+                            <string>all_tag_list</string>
                             <string>after_tag</string>
                           </tuple>
                         </value>

Modified: erp5/trunk/bt5/erp5_base/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/bt/revision?rev=31044&r1=31043&r2=31044&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/bt/revision [utf8] Thu Dec  3 16:40:36 2009
@@ -1,1 +1,1 @@
-657
+660