diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow.xml index d2d7acc44da44cae66058a9379f7005743a4a7d9..9ebf5e0c0ed14444b66a87dd41f6236d081861dc 100644 --- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow.xml +++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow.xml @@ -3,11 +3,8 @@ <record id="1" aka="AAAAAAAAAAE="> <pickle> <tuple> - <tuple> - <string>Products.DCWorkflow.DCWorkflow</string> - <string>DCWorkflowDefinition</string> - </tuple> - <none/> + <global name="DCWorkflowDefinition" module="Products.DCWorkflow.DCWorkflow"/> + <tuple/> </tuple> </pickle> <pickle> diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/cancel.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/cancel.xml index 8094875576c81c701901d491f02131797f6d6c37..400496d38a968433937263657948ed18a8b9423d 100644 --- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/cancel.xml +++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/cancel.xml @@ -3,11 +3,8 @@ <record id="1" aka="AAAAAAAAAAE="> <pickle> <tuple> - <tuple> - <string>Products.DCWorkflow.Transitions</string> - <string>TransitionDefinition</string> - </tuple> - <none/> + <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/> + <tuple/> </tuple> </pickle> <pickle> diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/cancel_action.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/cancel_action.xml index c2daae906ff651966e6e03978583122781dabe1b..e60cc68123c15cb43765990b248f2fbd92846864 100644 --- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/cancel_action.xml +++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/cancel_action.xml @@ -3,11 +3,8 @@ <record id="1" aka="AAAAAAAAAAE="> <pickle> <tuple> - <tuple> - <string>Products.DCWorkflow.Transitions</string> - <string>TransitionDefinition</string> - </tuple> - <none/> + <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/> + <tuple/> </tuple> </pickle> <pickle> @@ -28,7 +25,7 @@ </item> <item> <key> <string>actbox_url</string> </key> - <value> <string>%(content_url)s/BaseWorkflow_viewWorkflowActionDialog?workflow_action=cancel_action</string> </value> + <value> <string>%(content_url)s/Base_viewWorkflowActionDialog?workflow_action=cancel_action</string> </value> </item> <item> <key> <string>after_script_name</string> </key> @@ -70,11 +67,8 @@ <record id="2" aka="AAAAAAAAAAI="> <pickle> <tuple> - <tuple> - <string>Products.DCWorkflow.Guard</string> - <string>Guard</string> - </tuple> - <none/> + <global name="Guard" module="Products.DCWorkflow.Guard"/> + <tuple/> </tuple> </pickle> <pickle> diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/close_action.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/close_action.xml index 29d400cd981e5d8daf0cfac4997405fe4b4c16fe..bab502f58783852ff1dd7d95108931f9f871d7e9 100644 --- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/close_action.xml +++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/close_action.xml @@ -25,7 +25,7 @@ </item> <item> <key> <string>actbox_url</string> </key> - <value> <string>%(content_url)s/BaseWorkflow_viewWorkflowActionDialog?workflow_action=close_action</string> </value> + <value> <string>%(content_url)s/Base_viewWorkflowActionDialog?workflow_action=close_action</string> </value> </item> <item> <key> <string>after_script_name</string> </key> diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/delete_action.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/delete_action.xml index 020f514ba325fa5b9f53191395cd72215b21ead3..5a73cc7a71afc42d8c2348d5a5635e0e4311c12d 100644 --- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/delete_action.xml +++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/delete_action.xml @@ -3,11 +3,8 @@ <record id="1" aka="AAAAAAAAAAE="> <pickle> <tuple> - <tuple> - <string>Products.DCWorkflow.Transitions</string> - <string>TransitionDefinition</string> - </tuple> - <none/> + <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/> + <tuple/> </tuple> </pickle> <pickle> diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/open.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/open.xml index 2e117a29244396d0967021fb9b86fa6c2f85afbb..512dde93905cdffc184d85d68c9e5021e85361e7 100644 --- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/open.xml +++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/open.xml @@ -3,11 +3,8 @@ <record id="1" aka="AAAAAAAAAAE="> <pickle> <tuple> - <tuple> - <string>Products.DCWorkflow.Transitions</string> - <string>TransitionDefinition</string> - </tuple> - <none/> + <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/> + <tuple/> </tuple> </pickle> <pickle> diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/open_action.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/open_action.xml index e73bd0bc2808363e53c6c260cc5737d98b3e9c65..5744027fa7491d21712f20150d24f341f63dfc63 100644 --- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/open_action.xml +++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/open_action.xml @@ -3,11 +3,8 @@ <record id="1" aka="AAAAAAAAAAE="> <pickle> <tuple> - <tuple> - <string>Products.DCWorkflow.Transitions</string> - <string>TransitionDefinition</string> - </tuple> - <none/> + <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/> + <tuple/> </tuple> </pickle> <pickle> @@ -28,7 +25,7 @@ </item> <item> <key> <string>actbox_url</string> </key> - <value> <string>%(content_url)s/BaseWorkflow_viewWorkflowActionDialog?workflow_action=open_action</string> </value> + <value> <string>%(content_url)s/Base_viewWorkflowActionDialog?workflow_action=open_action</string> </value> </item> <item> <key> <string>after_script_name</string> </key> @@ -70,11 +67,8 @@ <record id="2" aka="AAAAAAAAAAI="> <pickle> <tuple> - <tuple> - <string>Products.DCWorkflow.Guard</string> - <string>Guard</string> - </tuple> - <none/> + <global name="Guard" module="Products.DCWorkflow.Guard"/> + <tuple/> </tuple> </pickle> <pickle> diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/update.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/update.xml index 0c89f22044207e8c7840e3dd705249eb80a3d55f..bfb3473e1fe1b713e7bb6704c4d73caaa593829c 100644 --- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/update.xml +++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/update.xml @@ -3,11 +3,8 @@ <record id="1" aka="AAAAAAAAAAE="> <pickle> <tuple> - <tuple> - <string>Products.DCWorkflow.Transitions</string> - <string>TransitionDefinition</string> - </tuple> - <none/> + <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/> + <tuple/> </tuple> </pickle> <pickle> diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/update_action.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/update_action.xml index 6b770a8ca59488f90d26d2d01c5d9c0b2f84f841..4a629053c180d76f0621610a6614ac4d92754c6d 100644 --- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/update_action.xml +++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/update_action.xml @@ -3,11 +3,8 @@ <record id="1" aka="AAAAAAAAAAE="> <pickle> <tuple> - <tuple> - <string>Products.DCWorkflow.Transitions</string> - <string>TransitionDefinition</string> - </tuple> - <none/> + <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/> + <tuple/> </tuple> </pickle> <pickle> @@ -28,7 +25,7 @@ </item> <item> <key> <string>actbox_url</string> </key> - <value> <string>%(content_url)s/BaseWorkflow_viewWorkflowActionDialog?workflow_action=update_action</string> </value> + <value> <string>%(content_url)s/Base_viewWorkflowActionDialog?workflow_action=update_action</string> </value> </item> <item> <key> <string>after_script_name</string> </key> @@ -36,7 +33,7 @@ </item> <item> <key> <string>description</string> </key> - <value> <string>With this action, the Manager of the Assignor can update the assignment data before reopening it.</string> </value> + <value> <string>With this action, the Manager or the Assignor can update the assignment data before reopening it.</string> </value> </item> <item> <key> <string>guard</string> </key> @@ -70,11 +67,8 @@ <record id="2" aka="AAAAAAAAAAI="> <pickle> <tuple> - <tuple> - <string>Products.DCWorkflow.Guard</string> - <string>Guard</string> - </tuple> - <none/> + <global name="Guard" module="Products.DCWorkflow.Guard"/> + <tuple/> </tuple> </pickle> <pickle> diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow.xml index f6025d6d6b6020fe837653631981aad13204f725..ed0254500c44e0101612ed727d5fa1206e7e08dd 100644 --- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow.xml +++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow.xml @@ -3,11 +3,8 @@ <record id="1" aka="AAAAAAAAAAE="> <pickle> <tuple> - <tuple> - <string>Products.DCWorkflow.DCWorkflow</string> - <string>DCWorkflowDefinition</string> - </tuple> - <none/> + <global name="DCWorkflowDefinition" module="Products.DCWorkflow.DCWorkflow"/> + <tuple/> </tuple> </pickle> <pickle> diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/transitions/answer.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/transitions/answer.xml index 619c7981cdfb84c433a1bbb7526c755b0620b0f5..9f2771fa4c7e49893e453248132255a6b8589bdb 100644 --- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/transitions/answer.xml +++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/transitions/answer.xml @@ -3,11 +3,8 @@ <record id="1" aka="AAAAAAAAAAE="> <pickle> <tuple> - <tuple> - <string>Products.DCWorkflow.Transitions</string> - <string>TransitionDefinition</string> - </tuple> - <none/> + <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/> + <tuple/> </tuple> </pickle> <pickle> diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/transitions/answer_action.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/transitions/answer_action.xml index 0988523eadcb57b9b1cec48531a0a07f0f19222f..0051021f4d88312e6dc9c0e8e7dc740b03aa51cd 100644 --- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/transitions/answer_action.xml +++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/transitions/answer_action.xml @@ -3,11 +3,8 @@ <record id="1" aka="AAAAAAAAAAE="> <pickle> <tuple> - <tuple> - <string>Products.DCWorkflow.Transitions</string> - <string>TransitionDefinition</string> - </tuple> - <none/> + <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/> + <tuple/> </tuple> </pickle> <pickle> @@ -28,7 +25,7 @@ </item> <item> <key> <string>actbox_url</string> </key> - <value> <string>%(content_url)s/BaseWorkflow_viewWorkflowActionDialog?workflow_action=answer_action</string> </value> + <value> <string>%(content_url)s/Base_viewWorkflowActionDialog?workflow_action=answer_action</string> </value> </item> <item> <key> <string>after_script_name</string> </key> @@ -70,11 +67,8 @@ <record id="2" aka="AAAAAAAAAAI="> <pickle> <tuple> - <tuple> - <string>Products.DCWorkflow.Guard</string> - <string>Guard</string> - </tuple> - <none/> + <global name="Guard" module="Products.DCWorkflow.Guard"/> + <tuple/> </tuple> </pickle> <pickle> diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/transitions/cancel.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/transitions/cancel.xml index ff3b3c4e7d8df6bc9a84c513e78cfa111394546a..7e6c616311aa4307d01b8df253ff6ecdf0322aed 100644 --- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/transitions/cancel.xml +++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/transitions/cancel.xml @@ -3,11 +3,8 @@ <record id="1" aka="AAAAAAAAAAE="> <pickle> <tuple> - <tuple> - <string>Products.DCWorkflow.Transitions</string> - <string>TransitionDefinition</string> - </tuple> - <none/> + <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/> + <tuple/> </tuple> </pickle> <pickle> diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/transitions/cancel_action.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/transitions/cancel_action.xml index 8d174e8089bc6aef10a19ef8b73c5405a28d449a..24ec4213dafffb1a424e28c41a48c2fc3b4a8025 100644 --- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/transitions/cancel_action.xml +++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/transitions/cancel_action.xml @@ -3,11 +3,8 @@ <record id="1" aka="AAAAAAAAAAE="> <pickle> <tuple> - <tuple> - <string>Products.DCWorkflow.Transitions</string> - <string>TransitionDefinition</string> - </tuple> - <none/> + <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/> + <tuple/> </tuple> </pickle> <pickle> @@ -28,7 +25,7 @@ </item> <item> <key> <string>actbox_url</string> </key> - <value> <string>%(content_url)s/BaseWorkflow_viewWorkflowActionDialog?workflow_action=cancel_action</string> </value> + <value> <string>%(content_url)s/Base_viewWorkflowActionDialog?workflow_action=cancel_action</string> </value> </item> <item> <key> <string>after_script_name</string> </key> @@ -70,11 +67,8 @@ <record id="2" aka="AAAAAAAAAAI="> <pickle> <tuple> - <tuple> - <string>Products.DCWorkflow.Guard</string> - <string>Guard</string> - </tuple> - <none/> + <global name="Guard" module="Products.DCWorkflow.Guard"/> + <tuple/> </tuple> </pickle> <pickle> diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/transitions/delete.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/transitions/delete.xml index 2659ed2cfab60b103e50ba08e57de27ab41d5a44..80cd6128ec2a7c9e600524a364347039b1ba31a5 100644 --- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/transitions/delete.xml +++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/transitions/delete.xml @@ -3,11 +3,8 @@ <record id="1" aka="AAAAAAAAAAE="> <pickle> <tuple> - <tuple> - <string>Products.DCWorkflow.Transitions</string> - <string>TransitionDefinition</string> - </tuple> - <none/> + <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/> + <tuple/> </tuple> </pickle> <pickle> diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/transitions/delete_action.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/transitions/delete_action.xml index 61ec1b632ccd595427364f3a59c6dc31823e4b47..f7d1e823457593de04bf0c7921e6ea5f51009c0b 100644 --- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/transitions/delete_action.xml +++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/transitions/delete_action.xml @@ -3,11 +3,8 @@ <record id="1" aka="AAAAAAAAAAE="> <pickle> <tuple> - <tuple> - <string>Products.DCWorkflow.Transitions</string> - <string>TransitionDefinition</string> - </tuple> - <none/> + <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/> + <tuple/> </tuple> </pickle> <pickle> diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/transitions/post.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/transitions/post.xml index cf90e14082cc56682f3555f8a46ed98f1fb7b385..9dfe76663c6ddcc3c83ab4d87cfca78922ee2dad 100644 --- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/transitions/post.xml +++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/transitions/post.xml @@ -3,11 +3,8 @@ <record id="1" aka="AAAAAAAAAAE="> <pickle> <tuple> - <tuple> - <string>Products.DCWorkflow.Transitions</string> - <string>TransitionDefinition</string> - </tuple> - <none/> + <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/> + <tuple/> </tuple> </pickle> <pickle> diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/transitions/post_action.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/transitions/post_action.xml index 3f1e791ee425dc392a17c921a95d26c58a40d3c6..e12fb18af64d40a1bc7e90b7807785b830d98548 100644 --- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/transitions/post_action.xml +++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/transitions/post_action.xml @@ -3,11 +3,8 @@ <record id="1" aka="AAAAAAAAAAE="> <pickle> <tuple> - <tuple> - <string>Products.DCWorkflow.Transitions</string> - <string>TransitionDefinition</string> - </tuple> - <none/> + <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/> + <tuple/> </tuple> </pickle> <pickle> @@ -28,7 +25,7 @@ </item> <item> <key> <string>actbox_url</string> </key> - <value> <string>%(content_url)s/BaseWorkflow_viewWorkflowActionDialog?workflow_action=post_action</string> </value> + <value> <string>%(content_url)s/Base_viewWorkflowActionDialog?workflow_action=post_action</string> </value> </item> <item> <key> <string>after_script_name</string> </key> @@ -70,11 +67,8 @@ <record id="2" aka="AAAAAAAAAAI="> <pickle> <tuple> - <tuple> - <string>Products.DCWorkflow.Guard</string> - <string>Guard</string> - </tuple> - <none/> + <global name="Guard" module="Products.DCWorkflow.Guard"/> + <tuple/> </tuple> </pickle> <pickle> diff --git a/bt5/erp5_base/bt/revision b/bt5/erp5_base/bt/revision index 1a7d3a1c8495b23465e0040b8884cae840577f4f..ab760c939afd177a8fb0343cb528e9e7e5ca1244 100644 --- a/bt5/erp5_base/bt/revision +++ b/bt5/erp5_base/bt/revision @@ -1 +1 @@ -318 \ No newline at end of file +319 \ No newline at end of file