Skip to content

erp5
erp5
Commit 62413ea3 authored by Alexandre Boeglin's avatar Alexandre Boeglin
Browse files
Options

* remove whitespaces at the end of interaction ids that result in "%20" in the filenames 

* do not call edit recursively, simply call the appropriate script instead

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@16105 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 2ec3bfbb
Show whitespace changes
Inline Side-by-side
Showing with 95 additions and 37 deletions
bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/interactions.xml
View file @ 62413ea3
......@@ -3,8 +3,11 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="Interaction" module="Products.ERP5.Interaction"/>
<tuple/>
<tuple>
<string>Products.ERP5.Interaction</string>
<string>Interaction</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
......
bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/interactions/DeliveryCell_edit_UpdateSimulation%20%20%20.xml → bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/interactions/DeliveryCell_edit_UpdateSimulation.xml
View file @ 62413ea3
......@@ -3,8 +3,11 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="InteractionDefinition" module="Products.ERP5.Interaction"/>
<tuple/>
<tuple>
<string>Products.ERP5.Interaction</string>
<string>InteractionDefinition</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
......@@ -53,7 +56,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>DeliveryCell_edit_UpdateSimulation </string> </value>
<value> <string>DeliveryCell_edit_UpdateSimulation</string> </value>
</item>
<item>
<key> <string>method_id</string> </key>
......
bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/interactions/DeliveryLine_edit_UpdateSimulation.xml
View file @ 62413ea3
......@@ -3,8 +3,11 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="InteractionDefinition" module="Products.ERP5.Interaction"/>
<tuple/>
<tuple>
<string>Products.ERP5.Interaction</string>
<string>InteractionDefinition</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
......
bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/interactions/Delivery_changeSimulationState_ReindexSimulation%20%20%20.xml → bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/interactions/Delivery_changeSimulationState_ReindexSimulation.xml
View file @ 62413ea3
......@@ -3,8 +3,11 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="InteractionDefinition" module="Products.ERP5.Interaction"/>
<tuple/>
<tuple>
<string>Products.ERP5.Interaction</string>
<string>InteractionDefinition</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
......@@ -55,7 +58,7 @@ FIXME: reindexObjectSecurity is probably not optimal, it may launch unnecessary
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Delivery_changeSimulationState_ReindexSimulation </string> </value>
<value> <string>Delivery_changeSimulationState_ReindexSimulation</string> </value>
</item>
<item>
<key> <string>method_id</string> </key>
......
bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/interactions/Delivery_edit_UpdateSimulation.xml
View file @ 62413ea3
......@@ -3,8 +3,11 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="InteractionDefinition" module="Products.ERP5.Interaction"/>
<tuple/>
<tuple>
<string>Products.ERP5.Interaction</string>
<string>InteractionDefinition</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
......
bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/scripts.xml
View file @ 62413ea3
......@@ -3,8 +3,11 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="Scripts" module="Products.DCWorkflow.Scripts"/>
<tuple/>
<tuple>
<string>Products.DCWorkflow.Scripts</string>
<string>Scripts</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
......
bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/scripts/DeliveryCell_UpdateSimulation.xml
View file @ 62413ea3
......@@ -3,8 +3,11 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
<tuple/>
<tuple>
<string>Products.PythonScripts.PythonScript</string>
<string>PythonScript</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
......@@ -66,7 +69,8 @@
<item>
<key> <string>_body</string> </key>
<value> <string># trigger the simulation update from the parent line\n
sci[\'object\'].getParentValue().edit()\n
line = sci[\'object\'].getParentValue()\n
context.DeliveryLine_UpdateSimulation(sci, line)\n
</string> </value>
</item>
<item>
......@@ -112,6 +116,8 @@ sci[\'object\'].getParentValue().edit()\n
<string>sci</string>
<string>_getattr_</string>
<string>_getitem_</string>
<string>line</string>
<string>context</string>
</tuple>
</value>
</item>
......
bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/scripts/DeliveryLine_UpdateSimulation.xml
View file @ 62413ea3
......@@ -3,8 +3,11 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
<tuple/>
<tuple>
<string>Products.PythonScripts.PythonScript</string>
<string>PythonScript</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
......@@ -65,8 +68,13 @@
</item>
<item>
<key> <string>_body</string> </key>
<value> <string># trigger the simulation update from the parent invoice\n
sci[\'object\'].getParentValue().edit()\n
<value> <string># trigger the simulation update from the parent delivery\n
\n
if obj is None:\n
delivery = sci[\'object\'].getParentValue()\n
else:\n
delivery = obj\n
context.Delivery_UpdateSimulation(sci, delivery)\n
</string> </value>
</item>
<item>
......@@ -83,7 +91,7 @@ sci[\'object\'].getParentValue().edit()\n
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>sci</string> </value>
<value> <string>sci, obj=None</string> </value>
</item>
<item>
<key> <string>errors</string> </key>
......@@ -103,15 +111,19 @@ sci[\'object\'].getParentValue().edit()\n
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
<value> <int>1</int> </value>
<value> <int>2</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
<value>
<tuple>
<string>sci</string>
<string>obj</string>
<string>None</string>
<string>_getattr_</string>
<string>_getitem_</string>
<string>delivery</string>
<string>context</string>
</tuple>
</value>
</item>
......@@ -123,7 +135,9 @@ sci[\'object\'].getParentValue().edit()\n
<item>
<key> <string>func_defaults</string> </key>
<value>
<tuple>
<none/>
</tuple>
</value>
</item>
<item>
......
bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/scripts/Delivery_ReindexRelatedSimulationMovement.xml
View file @ 62413ea3
......@@ -3,8 +3,11 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
<tuple/>
<tuple>
<string>Products.PythonScripts.PythonScript</string>
<string>PythonScript</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
......
bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/scripts/Delivery_UpdateSimulation.xml
View file @ 62413ea3
......@@ -3,8 +3,11 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
<tuple/>
<tuple>
<string>Products.PythonScripts.PythonScript</string>
<string>PythonScript</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
......@@ -72,7 +75,11 @@ It is responsible of updating the applied rule\n
\n
"""\n
\n
delivery = sci[\'object\']\n
if obj is None:\n
delivery = sci[\'object\']\n
else:\n
delivery = obj\n
\n
delivery_portal_type = delivery.getPortalType()\n
portal = sci.getPortal()\n
LOG = lambda msg:delivery.log("delivery_edit_workflow.Delivery_UpdateSimulation (%s)\\n" % (delivery.getPath()), msg)\n
......@@ -122,7 +129,7 @@ LOG(\'END\')\n
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>sci</string> </value>
<value> <string>sci, obj=None</string> </value>
</item>
<item>
<key> <string>errors</string> </key>
......@@ -142,13 +149,15 @@ LOG(\'END\')\n
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
<value> <int>1</int> </value>
<value> <int>2</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
<value>
<tuple>
<string>sci</string>
<string>obj</string>
<string>None</string>
<string>_getitem_</string>
<string>delivery</string>
<string>_getattr_</string>
......@@ -171,7 +180,9 @@ LOG(\'END\')\n
<item>
<key> <string>func_defaults</string> </key>
<value>
<tuple>
<none/>
</tuple>
</value>
</item>
<item>
......
bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/variables.xml
View file @ 62413ea3
......@@ -3,8 +3,11 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="Variables" module="Products.DCWorkflow.Variables"/>
<tuple/>
<tuple>
<string>Products.DCWorkflow.Variables</string>
<string>Variables</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
......
bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/delivery_edit_workflow/worklists.xml
View file @ 62413ea3
......@@ -3,8 +3,11 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="Worklists" module="Products.DCWorkflow.Worklists"/>
<tuple/>
<tuple>
<string>Products.DCWorkflow.Worklists</string>
<string>Worklists</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
......
bt5/erp5_trade/bt/revision
View file @ 62413ea3
101
\ No newline at end of file
105
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7