[Erp5-report] r36768 kazuhiko - in /erp5/trunk/bt5/erp5_base: SkinTemplateItem/portal_skins...

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Thu Jul  1 13:04:45 2010
New Revision: 36768

URL: http://svn.erp5.org?rev=36768&view=rev
Log:
configure activity dependencies for automatic solving.

Modified:
    erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_solveDivergenceAutomatically.xml
    erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/scripts/Workflow_solveDivergenceAutomatically.xml
    erp5/trunk/bt5/erp5_base/bt/revision

Modified: erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_solveDivergenceAutomatically.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_solveDivergenceAutomatically.xml?rev=36768&r1=36767&r2=36768&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_solveDivergenceAutomatically.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_solveDivergenceAutomatically.xml [utf8] Thu Jul  1 13:04:45 2010
@@ -59,9 +59,11 @@ solver_process_tool = delivery.getPortal
 solver_process = solver_process_tool.newSolverProcess(delivery, temp_object=True)\n
 if solver_process is not None:\n
   solver_process.buildTargetSolverList()\n
-  solver_process.solve()\n
-# XXX It can be required to wait indexing.\n
-delivery.updateCausalityState(solve_automatically=False)\n
+  solver_tag = \'%s_solve\' % delivery.getPath()\n
+  solver_process.solve(activate_kw={\'tag\':solver_tag})\n
+  delivery.activate(after_tag=solver_tag).updateCausalityState(solve_automatically=False)\n
+else:\n
+  delivery.updateCausalityState(solve_automatically=False)\n
 </string> </value>
         </item>
         <item>
@@ -111,8 +113,9 @@ delivery.updateCausalityState(solve_auto
                             <string>_getattr_</string>
                             <string>solver_process_tool</string>
                             <string>True</string>
-                            <string>None</string>
                             <string>solver_process</string>
+                            <string>None</string>
+                            <string>solver_tag</string>
                             <string>False</string>
                           </tuple>
                         </value>

Modified: erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/scripts/Workflow_solveDivergenceAutomatically.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/scripts/Workflow_solveDivergenceAutomatically.xml?rev=36768&r1=36767&r2=36768&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/scripts/Workflow_solveDivergenceAutomatically.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/scripts/Workflow_solveDivergenceAutomatically.xml [utf8] Thu Jul  1 13:04:45 2010
@@ -63,8 +63,8 @@ if solver_tool is None or solver_process
   delivery.diverge()\n
   return\n
 else:\n
-  activate_kw = state_change[\'kwargs\'].get(\'activate_kw\') or {}\n
-  delivery.activate(**activate_kw).Delivery_solveDivergenceAutomatically()\n
+  solver_tag = \'%s_solve\' % delivery.getPath()\n
+  delivery.activate(tag=solver_tag).Delivery_solveDivergenceAutomatically()\n
 </string> </value>
         </item>
         <item>
@@ -116,8 +116,7 @@ else:\n
                             <string>None</string>
                             <string>solver_tool</string>
                             <string>solver_process_tool</string>
-                            <string>activate_kw</string>
-                            <string>_apply_</string>
+                            <string>solver_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=36768&r1=36767&r2=36768&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/bt/revision [utf8] Thu Jul  1 13:04:45 2010
@@ -1 +1 @@
-787
\ No newline at end of file
+788
\ No newline at end of file