[Erp5-report] r33583 kazuhiko - in /erp5/trunk: bt5/erp5_simulation/SkinTemplateItem/portal...

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Wed Mar 10 14:50:54 2010
New Revision: 33583

URL: http://svn.erp5.org?rev=33583&view=rev
Log:
set solver category on the delivery document in SolverTool.newSolverProcess() not in python script.

Modified:
    erp5/trunk/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_getSolverDecisionList.xml
    erp5/trunk/products/ERP5/Tool/SolverTool.py

Modified: erp5/trunk/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_getSolverDecisionList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_getSolverDecisionList.xml?rev=33583&r1=33582&r2=33583&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_getSolverDecisionList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_getSolverDecisionList.xml [utf8] Wed Mar 10 14:50:54 2010
@@ -59,15 +59,12 @@
 solver_process = None\n
 solver_list = context.getSolverValueList()\n
 for i in solver_list:\n
-  # XXX if \'solving\' decision exists, what should we do?\n
-  if i.getValidationState() != \'solved\':\n
+  if i.getValidationState() == \'draft\':\n
     solver_process = i\n
     break\n
 \n
 if solver_process is None:\n
   solver_process = context.getPortalObject().portal_solvers.newSolverProcess(context)\n
-  solver_list.append(solver_process.getRelativeUrl())\n
-  context.setSolverList(solver_list)\n
 else:\n
   # update existing solver process\n
   solver_process.buildSolverDecisionList(context)\n

Modified: erp5/trunk/products/ERP5/Tool/SolverTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Tool/SolverTool.py?rev=33583&r1=33582&r2=33583&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Tool/SolverTool.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Tool/SolverTool.py [utf8] Wed Mar 10 14:50:54 2010
@@ -157,6 +157,12 @@
     # And build decisions
     new_solver.buildSolverDecisionList(delivery_or_movement=delivery_or_movement,
                                        temp_object=temp_object)
+
+    # Append the solver process into the delivery's solver category
+    delivery = delivery_or_movement.getRootDeliveryValue()
+    solver_list = delivery.getSolverValueList()
+    solver_list.append(new_solver)
+    delivery.setSolverValueList(solver_list)
     return new_solver
 
   def getSolverProcessValueList(self, delivery_or_movement=None, validation_state=None):