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

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Wed Jun 30 17:11:29 2010
New Revision: 36752

URL: http://svn.erp5.org?rev=36752&view=rev
Log:
if divergence is already solved in any reason, do nothing.

Modified:
    erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_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=36752&r1=36751&r2=36752&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] Wed Jun 30 17:11:29 2010
@@ -57,8 +57,9 @@
 solver_process_tool = delivery.getPortalObject().portal_solver_processes\n
 # XXX We sometimes want to store solver process document persistently.\n
 solver_process = solver_process_tool.newSolverProcess(delivery, temp_object=True)\n
-solver_process.buildTargetSolverList()\n
-solver_process.solve()\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
 </string> </value>
@@ -110,6 +111,7 @@ delivery.updateCausalityState(solve_auto
                             <string>_getattr_</string>
                             <string>solver_process_tool</string>
                             <string>True</string>
+                            <string>None</string>
                             <string>solver_process</string>
                             <string>False</string>
                           </tuple>

Modified: erp5/trunk/bt5/erp5_base/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/bt/revision?rev=36752&r1=36751&r2=36752&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/bt/revision [utf8] Wed Jun 30 17:11:29 2010
@@ -1 +1 @@
-786
\ No newline at end of file
+787
\ No newline at end of file