From fb3f37dc3c5412598cbb7a233a6e5243e0d078f9 Mon Sep 17 00:00:00 2001 From: Leonardo Rochael Almeida <leonardo@nexedi.com> Date: Fri, 20 May 2011 18:49:38 +0200 Subject: [PATCH] erp5_simulation: split Delivery_getSolverDecisionList script to make parts reusable --- .../Delivery_getSolverDecisionList.xml | 21 +---- .../Delivery_getSolverProcess.xml | 77 +++++++++++++++++++ .../SolverProcess_getSolverDecisionList.xml | 67 ++++++++++++++++ bt5/erp5_simulation/bt/revision | 2 +- 4 files changed, 147 insertions(+), 20 deletions(-) create mode 100644 bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_getSolverProcess.xml create mode 100644 bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverProcess_getSolverDecisionList.xml diff --git a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_getSolverDecisionList.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_getSolverDecisionList.xml index cf48306ee4..8ca3d4bebc 100644 --- a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_getSolverDecisionList.xml +++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_getSolverDecisionList.xml @@ -50,26 +50,9 @@ </item> <item> <key> <string>_body</string> </key> - <value> <string># XXX currently we create a Solver Process and build Solver Decision in it if missing.\n -# But for better performance, Solver Process and Solver Decision should be created beforehand\n -# by causality workflow when a delivery becomes divergent.\n -solver_process = None\n -solver_list = context.getSolverValueList()\n -for i in solver_list:\n - if i.getValidationState() == \'draft\':\n - solver_process = i\n - break\n -\n -\n -if solver_process is None:\n - solver_process = context.getPortalObject().portal_solver_processes.newSolverProcess(context)\n -else:\n - # update existing solver process\n - solver_process.buildSolverDecisionList(context)\n -\n + <value> <string>solver_process = context.Delivery_getSolverProcess()\n # XXX should omit \'solved\' decision?\n -solver_decision_list = solver_process.objectValues(portal_type=\'Solver Decision\')\n -return solver_decision_list\n +return solver_process.SolverProcess_getSolverDecisionList()\n </string> </value> </item> <item> diff --git a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_getSolverProcess.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_getSolverProcess.xml new file mode 100644 index 0000000000..d2e8cf93bf --- /dev/null +++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_getSolverProcess.xml @@ -0,0 +1,77 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <global name="PythonScript" module="Products.PythonScripts.PythonScript"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>Script_magic</string> </key> + <value> <int>3</int> </value> + </item> + <item> + <key> <string>_bind_names</string> </key> + <value> + <object> + <klass> + <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/> + </klass> + <tuple/> + <state> + <dictionary> + <item> + <key> <string>_asgns</string> </key> + <value> + <dictionary> + <item> + <key> <string>name_container</string> </key> + <value> <string>container</string> </value> + </item> + <item> + <key> <string>name_context</string> </key> + <value> <string>context</string> </value> + </item> + <item> + <key> <string>name_m_self</string> </key> + <value> <string>script</string> </value> + </item> + <item> + <key> <string>name_subpath</string> </key> + <value> <string>traverse_subpath</string> </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </state> + </object> + </value> + </item> + <item> + <key> <string>_body</string> </key> + <value> <string># XXX currently we create a Solver Process and build Solver Decision in it if missing.\n +# But for better performance, Solver Process and Solver Decision should be created beforehand\n +# by causality workflow when a delivery becomes divergent.\n +for solver_process in context.getSolverValueList():\n + if solver_process.getValidationState() == \'draft\':\n + solver_process.buildSolverDecisionList(context)\n + break\n +else:\n + solver_process = context.getPortalObject().portal_solver_processes.newSolverProcess(context)\n +\n +return solver_process\n +</string> </value> + </item> + <item> + <key> <string>_params</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>Delivery_getSolverProcess</string> </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverProcess_getSolverDecisionList.xml b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverProcess_getSolverDecisionList.xml new file mode 100644 index 0000000000..c69adba714 --- /dev/null +++ b/bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/SolverProcess_getSolverDecisionList.xml @@ -0,0 +1,67 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <global name="PythonScript" module="Products.PythonScripts.PythonScript"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>Script_magic</string> </key> + <value> <int>3</int> </value> + </item> + <item> + <key> <string>_bind_names</string> </key> + <value> + <object> + <klass> + <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/> + </klass> + <tuple/> + <state> + <dictionary> + <item> + <key> <string>_asgns</string> </key> + <value> + <dictionary> + <item> + <key> <string>name_container</string> </key> + <value> <string>container</string> </value> + </item> + <item> + <key> <string>name_context</string> </key> + <value> <string>context</string> </value> + </item> + <item> + <key> <string>name_m_self</string> </key> + <value> <string>script</string> </value> + </item> + <item> + <key> <string>name_subpath</string> </key> + <value> <string>traverse_subpath</string> </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </state> + </object> + </value> + </item> + <item> + <key> <string>_body</string> </key> + <value> <string>return context.objectValues(portal_type=\'Solver Decision\')\n +</string> </value> + </item> + <item> + <key> <string>_params</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>SolverProcess_getSolverDecisionList</string> </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_simulation/bt/revision b/bt5/erp5_simulation/bt/revision index 7b27b25197..4a8d924028 100644 --- a/bt5/erp5_simulation/bt/revision +++ b/bt5/erp5_simulation/bt/revision @@ -1 +1 @@ -173 \ No newline at end of file +174 \ No newline at end of file -- 2.30.9