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

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Tue Jun  2 21:37:59 2009
New Revision: 27338

URL: http://svn.erp5.org?rev=27338&view=rev
Log:
wait for '(delivery_path)_expand' tag to prevent 'Delivery xxx has more than one applied rule.' problem.

Modified:
    erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_movement_simulation_interaction_workflow/scripts/DeliveryMovement_updateSimulation.xml
    erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_simulation_interaction_workflow/scripts/Delivery_updateSimulation.xml
    erp5/trunk/bt5/erp5_base/bt/revision

Modified: erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_movement_simulation_interaction_workflow/scripts/DeliveryMovement_updateSimulation.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_movement_simulation_interaction_workflow/scripts/DeliveryMovement_updateSimulation.xml?rev=27338&r1=27337&r2=27338&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_movement_simulation_interaction_workflow/scripts/DeliveryMovement_updateSimulation.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_movement_simulation_interaction_workflow/scripts/DeliveryMovement_updateSimulation.xml [utf8] Tue Jun  2 21:37:59 2009
@@ -55,8 +55,10 @@
             <key> <string>_body</string> </key>
             <value> <string>delivery = state_change[\'object\'].getExplanationValue()\n
 \n
-path_and_method_id = (delivery.getPath(), (\'immediateReindexObject\',\'recursiveImmediateReindexObject\'))\n
-expand_tag = delivery.getPath() + \'_updateAppliedRule\'\n
+delivery_path = delivery.getPath()\n
+path_and_method_id = (delivery_path, (\'immediateReindexObject\',\'recursiveImmediateReindexObject\'))\n
+afer_tag = delivery_path + \'_expand\'\n
+tag = delivery_path + \'_updateAppliedRule\'\n
 \n
 priority = 3\n
 \n
@@ -66,7 +68,8 @@
 }\n
 delivery.activate(\n
     after_path_and_method_id=path_and_method_id,\n
-    tag=expand_tag,\n
+    after_tag=after_tag,\n
+    tag=tag,\n
     priority=priority,\n
     ).Delivery_updateAppliedRule(activate_kw=activate_kw)\n
 </string> </value>
@@ -109,10 +112,14 @@
                             <string>_getattr_</string>
                             <string>_getitem_</string>
                             <string>delivery</string>
+                            <string>delivery_path</string>
                             <string>path_and_method_id</string>
+                            <string>afer_tag</string>
+                            <string>tag</string>
+                            <string>priority</string>
                             <string>expand_tag</string>
-                            <string>priority</string>
                             <string>activate_kw</string>
+                            <string>after_tag</string>
                           </tuple>
                         </value>
                     </item>

Modified: erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_simulation_interaction_workflow/scripts/Delivery_updateSimulation.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_simulation_interaction_workflow/scripts/Delivery_updateSimulation.xml?rev=27338&r1=27337&r2=27338&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_simulation_interaction_workflow/scripts/Delivery_updateSimulation.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_simulation_interaction_workflow/scripts/Delivery_updateSimulation.xml [utf8] Tue Jun  2 21:37:59 2009
@@ -53,10 +53,12 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>delivery = state_change[\'object\']\n
+            <value> <string>delivery = state_change[\'object\'].getExplanationValue()\n
 \n
-path_and_method_id = (delivery.getPath(), (\'immediateReindexObject\',\'recursiveImmediateReindexObject\'))\n
-expand_tag = delivery.getPath() + \'_updateAppliedRule\'\n
+delivery_path = delivery.getPath()\n
+path_and_method_id = (delivery_path, (\'immediateReindexObject\',\'recursiveImmediateReindexObject\'))\n
+afer_tag = delivery_path + \'_expand\'\n
+tag = delivery_path + \'_updateAppliedRule\'\n
 \n
 priority = 3\n
 \n
@@ -66,7 +68,8 @@
 }\n
 delivery.activate(\n
     after_path_and_method_id=path_and_method_id,\n
-    tag=expand_tag,\n
+    after_tag=after_tag,\n
+    tag=tag,\n
     priority=priority,\n
     ).Delivery_updateAppliedRule(activate_kw=activate_kw)\n
 </string> </value>
@@ -106,13 +109,17 @@
                         <value>
                           <tuple>
                             <string>state_change</string>
+                            <string>_getattr_</string>
                             <string>_getitem_</string>
                             <string>delivery</string>
-                            <string>_getattr_</string>
+                            <string>delivery_path</string>
                             <string>path_and_method_id</string>
+                            <string>afer_tag</string>
+                            <string>tag</string>
+                            <string>priority</string>
                             <string>expand_tag</string>
-                            <string>priority</string>
                             <string>activate_kw</string>
+                            <string>after_tag</string>
                           </tuple>
                         </value>
                     </item>

Modified: erp5/trunk/bt5/erp5_base/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/bt/revision?rev=27338&r1=27337&r2=27338&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/bt/revision [utf8] Tue Jun  2 21:37:59 2009
@@ -1,1 +1,1 @@
-598
+599