From 7f0ba7f29060797ccd2779711c5291d33489982e Mon Sep 17 00:00:00 2001 From: Jean-Paul Smets <jp@nexedi.com> Date: Sun, 17 Jun 2007 21:07:15 +0000 Subject: [PATCH] Implementation of security in task_report_workflow. Added titles and descriptions to task_workflow. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@14843 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../portal_workflow/task_report_workflow.xml | 4 +- .../task_report_workflow/states/cancelled.xml | 18 ++- .../task_report_workflow/states/confirmed.xml | 22 +++- .../task_report_workflow/states/deleted.xml | 104 ++++++++++++++++++ .../task_report_workflow/states/delivered.xml | 16 ++- .../task_report_workflow/states/draft.xml | 8 ++ .../task_report_workflow/states/ready.xml | 55 --------- .../task_report_workflow/states/started.xml | 70 ++++++++++++ .../task_report_workflow/states/stopped.xml | 68 ++++++++++++ .../transitions/cancel_action.xml | 25 ++++- .../transitions/confirm_action.xml | 25 ++++- .../transitions/delete.xml | 70 ++++++++++++ .../delete_action.xml} | 62 ++++++----- .../transitions/deliver_action.xml | 2 +- .../transitions/start_action.xml | 2 +- .../transitions/stop_action.xml | 2 +- .../variables/portal_type.xml | 32 ------ .../variables/stop_date.xml | 85 -------------- .../worklists/assignee_confirmed_task.xml | 8 -- .../worklists/assignee_started_task.xml | 10 +- .../worklists/assignor_confirmed_task.xml | 10 +- .../worklists/assignor_started_task.xml | 10 +- .../worklists/assignor_stopped_task.xml | 10 +- .../portal_workflow/task_workflow.xml | 14 +++ .../task_workflow/states/auto_planned.xml | 2 +- .../task_workflow/states/cancelled.xml | 10 +- .../task_workflow/states/confirmed.xml | 8 +- .../task_workflow/states/deleted.xml | 104 ++++++++++++++++++ .../task_workflow/states/draft.xml | 4 +- .../task_workflow/states/ordered.xml | 2 +- .../task_workflow/states/planned.xml | 2 +- .../task_workflow/transitions/auto_plan.xml | 4 +- .../task_workflow/transitions/cancel.xml | 2 +- .../transitions/cancel_action.xml | 5 +- .../task_workflow/transitions/confirm.xml | 2 +- .../transitions/confirm_action.xml | 4 +- .../task_workflow/transitions/delete.xml | 70 ++++++++++++ .../transitions/delete_action.xml | 95 ++++++++++++++++ .../task_workflow/transitions/order.xml | 2 +- .../transitions/order_action.xml | 4 +- .../task_workflow/transitions/plan.xml | 2 +- .../task_workflow/transitions/plan_action.xml | 4 +- .../task_workflow/variables/action.xml | 2 +- .../task_workflow/variables/actor.xml | 2 +- .../task_workflow/variables/comment.xml | 2 +- .../task_workflow/variables/error_message.xml | 2 +- .../task_workflow/variables/history.xml | 2 +- .../task_workflow/variables/time.xml | 2 +- 48 files changed, 783 insertions(+), 287 deletions(-) create mode 100644 bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/states/deleted.xml delete mode 100644 bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/states/ready.xml create mode 100644 bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/transitions/delete.xml rename bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/{variables/start_date.xml => transitions/delete_action.xml} (50%) delete mode 100644 bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/variables/stop_date.xml create mode 100644 bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/states/deleted.xml create mode 100644 bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/delete.xml create mode 100644 bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/delete_action.xml diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow.xml index d6078c3fa1..5c24542ea6 100644 --- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow.xml +++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow.xml @@ -64,6 +64,8 @@ <tuple> <string>Modify portal content</string> <string>Add portal content</string> + <string>View</string> + <string>Access contents information</string> </tuple> </value> </item> @@ -73,7 +75,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Task Report</string> </value> + <value> <string>Task Report Workflow</string> </value> </item> <item> <key> <string>uid</string> </key> diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/states/cancelled.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/states/cancelled.xml index 85fcd059a7..35b2c92b56 100644 --- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/states/cancelled.xml +++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/states/cancelled.xml @@ -70,7 +70,12 @@ <item> <key> <string>Access contents information</string> </key> <value> - <list/> + <tuple> + <string>Assignor</string> + <string>Auditor</string> + <string>Manager</string> + <string>Owner</string> + </tuple> </value> </item> <item> @@ -85,6 +90,17 @@ <tuple/> </value> </item> + <item> + <key> <string>View</string> </key> + <value> + <tuple> + <string>Assignor</string> + <string>Auditor</string> + <string>Manager</string> + <string>Owner</string> + </tuple> + </value> + </item> </dictionary> </value> </item> diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/states/confirmed.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/states/confirmed.xml index abf933476a..c4448a0427 100644 --- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/states/confirmed.xml +++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/states/confirmed.xml @@ -84,33 +84,45 @@ <item> <key> <string>Access contents information</string> </key> <value> - <list> + <tuple> <string>Assignee</string> <string>Assignor</string> <string>Associate</string> <string>Auditor</string> <string>Author</string> <string>Manager</string> - </list> + </tuple> + </value> + </item> + <item> + <key> <string>Add portal content</string> </key> + <value> + <tuple> + <string>Assignee</string> + <string>Assignor</string> + </tuple> </value> </item> <item> <key> <string>Modify portal content</string> </key> <value> - <list/> + <tuple> + <string>Assignee</string> + <string>Assignor</string> + </tuple> </value> </item> <item> <key> <string>View</string> </key> <value> - <list> + <tuple> <string>Assignee</string> <string>Assignor</string> <string>Associate</string> <string>Auditor</string> <string>Author</string> <string>Manager</string> - </list> + </tuple> </value> </item> </dictionary> diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/states/deleted.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/states/deleted.xml new file mode 100644 index 0000000000..8d05e1749d --- /dev/null +++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/states/deleted.xml @@ -0,0 +1,104 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <tuple> + <string>Products.DCWorkflow.States</string> + <string>StateDefinition</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>__ac_local_roles__</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>deleted</string> </value> + </item> + <item> + <key> <string>permission_roles</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Deleted</string> </value> + </item> + <item> + <key> <string>transitions</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>type_list</string> </key> + <value> + <tuple/> + </value> + </item> + </dictionary> + </pickle> + </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <tuple> + <tuple> + <string>Persistence</string> + <string>PersistentMapping</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_container</string> </key> + <value> + <dictionary> + <item> + <key> <string>Access contents information</string> </key> + <value> + <tuple> + <string>Manager</string> + </tuple> + </value> + </item> + <item> + <key> <string>Add portal content</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>Modify portal content</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>View</string> </key> + <value> + <tuple> + <string>Manager</string> + </tuple> + </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/states/delivered.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/states/delivered.xml index 49bcec6789..3ffdbc060c 100644 --- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/states/delivered.xml +++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/states/delivered.xml @@ -72,7 +72,13 @@ <item> <key> <string>Access contents information</string> </key> <value> - <list/> + <tuple> + <string>Assignee</string> + <string>Assignor</string> + <string>Associate</string> + <string>Auditor</string> + <string>Manager</string> + </tuple> </value> </item> <item> @@ -90,7 +96,13 @@ <item> <key> <string>View</string> </key> <value> - <list/> + <tuple> + <string>Assignee</string> + <string>Assignor</string> + <string>Associate</string> + <string>Auditor</string> + <string>Manager</string> + </tuple> </value> </item> </dictionary> diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/states/draft.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/states/draft.xml index a1a5dde416..d5a0ac18f5 100644 --- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/states/draft.xml +++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/states/draft.xml @@ -38,9 +38,17 @@ <string>cancel_action</string> <string>confirm</string> <string>confirm_action</string> + <string>delete</string> + <string>delete_action</string> </tuple> </value> </item> + <item> + <key> <string>type_list</string> </key> + <value> + <tuple/> + </value> + </item> <item> <key> <string>uid</string> </key> <value> diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/states/ready.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/states/ready.xml deleted file mode 100644 index 28454a158c..0000000000 --- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/states/ready.xml +++ /dev/null @@ -1,55 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <tuple> - <string>Products.DCWorkflow.States</string> - <string>StateDefinition</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>__ac_local_roles__</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>description</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>ready</string> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string>Ready</string> </value> - </item> - <item> - <key> <string>transitions</string> </key> - <value> - <tuple> - <string>cancel</string> - <string>cancel_action</string> - <string>start</string> - <string>start_action</string> - </tuple> - </value> - </item> - <item> - <key> <string>type_list</string> </key> - <value> - <tuple> - <string>reserved_inventory</string> - </tuple> - </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/states/started.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/states/started.xml index bdac654cec..21054d9732 100644 --- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/states/started.xml +++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/states/started.xml @@ -26,6 +26,12 @@ <key> <string>id</string> </key> <value> <string>started</string> </value> </item> + <item> + <key> <string>permission_roles</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> + </item> <item> <key> <string>title</string> </key> <value> <string>Started</string> </value> @@ -53,4 +59,68 @@ </dictionary> </pickle> </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <tuple> + <tuple> + <string>Persistence</string> + <string>PersistentMapping</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_container</string> </key> + <value> + <dictionary> + <item> + <key> <string>Access contents information</string> </key> + <value> + <tuple> + <string>Assignee</string> + <string>Assignor</string> + <string>Associate</string> + <string>Auditor</string> + <string>Manager</string> + </tuple> + </value> + </item> + <item> + <key> <string>Add portal content</string> </key> + <value> + <tuple> + <string>Assignee</string> + <string>Assignor</string> + </tuple> + </value> + </item> + <item> + <key> <string>Modify portal content</string> </key> + <value> + <tuple> + <string>Assignee</string> + <string>Assignor</string> + </tuple> + </value> + </item> + <item> + <key> <string>View</string> </key> + <value> + <tuple> + <string>Assignee</string> + <string>Assignor</string> + <string>Associate</string> + <string>Auditor</string> + <string>Manager</string> + </tuple> + </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> </ZopeData> diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/states/stopped.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/states/stopped.xml index 5e0735d888..d39b65a0a7 100644 --- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/states/stopped.xml +++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/states/stopped.xml @@ -26,6 +26,12 @@ <key> <string>id</string> </key> <value> <string>stopped</string> </value> </item> + <item> + <key> <string>permission_roles</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> + </item> <item> <key> <string>title</string> </key> <value> <string>Stopped</string> </value> @@ -50,4 +56,66 @@ </dictionary> </pickle> </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <tuple> + <tuple> + <string>Persistence</string> + <string>PersistentMapping</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_container</string> </key> + <value> + <dictionary> + <item> + <key> <string>Access contents information</string> </key> + <value> + <tuple> + <string>Assignee</string> + <string>Assignor</string> + <string>Associate</string> + <string>Auditor</string> + <string>Manager</string> + </tuple> + </value> + </item> + <item> + <key> <string>Add portal content</string> </key> + <value> + <tuple> + <string>Assignor</string> + </tuple> + </value> + </item> + <item> + <key> <string>Modify portal content</string> </key> + <value> + <tuple> + <string>Assignor</string> + </tuple> + </value> + </item> + <item> + <key> <string>View</string> </key> + <value> + <tuple> + <string>Assignee</string> + <string>Assignor</string> + <string>Associate</string> + <string>Auditor</string> + <string>Manager</string> + </tuple> + </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> </ZopeData> diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/transitions/cancel_action.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/transitions/cancel_action.xml index 8a8647a10e..ccdc497f3e 100644 --- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/transitions/cancel_action.xml +++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/transitions/cancel_action.xml @@ -41,7 +41,7 @@ <item> <key> <string>guard</string> </key> <value> - <none/> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> </value> </item> <item> @@ -73,4 +73,27 @@ </dictionary> </pickle> </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <tuple> + <tuple> + <string>Products.DCWorkflow.Guard</string> + <string>Guard</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>roles</string> </key> + <value> + <tuple> + <string>Assignor</string> + </tuple> + </value> + </item> + </dictionary> + </pickle> + </record> </ZopeData> diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/transitions/confirm_action.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/transitions/confirm_action.xml index e80720f168..21686de578 100644 --- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/transitions/confirm_action.xml +++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/transitions/confirm_action.xml @@ -41,7 +41,7 @@ <item> <key> <string>guard</string> </key> <value> - <none/> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> </value> </item> <item> @@ -73,4 +73,27 @@ </dictionary> </pickle> </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <tuple> + <tuple> + <string>Products.DCWorkflow.Guard</string> + <string>Guard</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>roles</string> </key> + <value> + <tuple> + <string>Assignor</string> + </tuple> + </value> + </item> + </dictionary> + </pickle> + </record> </ZopeData> diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/transitions/delete.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/transitions/delete.xml new file mode 100644 index 0000000000..2659ed2cfa --- /dev/null +++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/transitions/delete.xml @@ -0,0 +1,70 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <tuple> + <string>Products.DCWorkflow.Transitions</string> + <string>TransitionDefinition</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>__ac_local_roles__</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>actbox_category</string> </key> + <value> <string>workflow</string> </value> + </item> + <item> + <key> <string>actbox_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>actbox_url</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>after_script_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>guard</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>delete</string> </value> + </item> + <item> + <key> <string>new_state_id</string> </key> + <value> <string>deleted</string> </value> + </item> + <item> + <key> <string>script_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>trigger_type</string> </key> + <value> <int>2</int> </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/variables/start_date.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/transitions/delete_action.xml similarity index 50% rename from bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/variables/start_date.xml rename to bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/transitions/delete_action.xml index eefa0e2162..3a371f6c10 100644 --- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/variables/start_date.xml +++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/transitions/delete_action.xml @@ -4,8 +4,8 @@ <pickle> <tuple> <tuple> - <string>Products.DCWorkflow.Variables</string> - <string>VariableDefinition</string> + <string>Products.DCWorkflow.Transitions</string> + <string>TransitionDefinition</string> </tuple> <none/> </tuple> @@ -19,45 +19,49 @@ </value> </item> <item> - <key> <string>default_expr</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> + <key> <string>actbox_category</string> </key> + <value> <string>workflow</string> </value> </item> <item> - <key> <string>default_value</string> </key> + <key> <string>actbox_name</string> </key> <value> <string></string> </value> </item> <item> - <key> <string>description</string> </key> + <key> <string>actbox_url</string> </key> <value> <string></string> </value> </item> <item> - <key> <string>for_catalog</string> </key> - <value> <int>0</int> </value> + <key> <string>after_script_name</string> </key> + <value> <string>delete</string> </value> </item> <item> - <key> <string>for_status</string> </key> - <value> <int>1</int> </value> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>guard</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> </item> <item> <key> <string>id</string> </key> - <value> <string>start_date</string> </value> + <value> <string>delete_action</string> </value> </item> <item> - <key> <string>info_guard</string> </key> - <value> - <none/> - </value> + <key> <string>new_state_id</string> </key> + <value> <string></string> </value> </item> <item> - <key> <string>uid</string> </key> - <value> - <none/> - </value> + <key> <string>script_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> </item> <item> - <key> <string>update_always</string> </key> + <key> <string>trigger_type</string> </key> <value> <int>1</int> </value> </item> </dictionary> @@ -67,8 +71,8 @@ <pickle> <tuple> <tuple> - <string>Products.CMFCore.Expression</string> - <string>Expression</string> + <string>Products.DCWorkflow.Guard</string> + <string>Guard</string> </tuple> <none/> </tuple> @@ -76,8 +80,14 @@ <pickle> <dictionary> <item> - <key> <string>text</string> </key> - <value> <string>python:state_change.kwargs.get(\'start_date\',state_change.object.getStartDate())</string> </value> + <key> <string>roles</string> </key> + <value> + <tuple> + <string>Owner</string> + <string>Assignor</string> + <string>Manager</string> + </tuple> + </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/transitions/deliver_action.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/transitions/deliver_action.xml index aa25662e59..d19aa956a1 100644 --- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/transitions/deliver_action.xml +++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/transitions/deliver_action.xml @@ -83,7 +83,7 @@ <key> <string>roles</string> </key> <value> <tuple> - <string>Assignor , Owner</string> + <string>Assignor</string> </tuple> </value> </item> diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/transitions/start_action.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/transitions/start_action.xml index 57dfea1673..b9c2286e6c 100644 --- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/transitions/start_action.xml +++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/transitions/start_action.xml @@ -84,7 +84,7 @@ <value> <tuple> <string>Assignee</string> - <string>Owner</string> + <string>Assignor</string> </tuple> </value> </item> diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/transitions/stop_action.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/transitions/stop_action.xml index 13ac983f31..d9d33f96cb 100644 --- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/transitions/stop_action.xml +++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/transitions/stop_action.xml @@ -84,7 +84,7 @@ <value> <tuple> <string>Assignee</string> - <string>Owner</string> + <string>Assignor</string> </tuple> </value> </item> diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/variables/portal_type.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/variables/portal_type.xml index aaacee8edc..e1cd18ba7b 100644 --- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/variables/portal_type.xml +++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/variables/portal_type.xml @@ -18,42 +18,10 @@ <none/> </value> </item> - <item> - <key> <string>default_expr</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>default_value</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>description</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>for_catalog</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>for_status</string> </key> - <value> <int>0</int> </value> - </item> <item> <key> <string>id</string> </key> <value> <string>portal_type</string> </value> </item> - <item> - <key> <string>info_guard</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>update_always</string> </key> - <value> <int>0</int> </value> - </item> </dictionary> </pickle> </record> diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/variables/stop_date.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/variables/stop_date.xml deleted file mode 100644 index 23960e36b7..0000000000 --- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/variables/stop_date.xml +++ /dev/null @@ -1,85 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <tuple> - <string>Products.DCWorkflow.Variables</string> - <string>VariableDefinition</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>__ac_local_roles__</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>default_expr</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> - </item> - <item> - <key> <string>default_value</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>description</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>for_catalog</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>for_status</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>stop_date</string> </value> - </item> - <item> - <key> <string>info_guard</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>uid</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>update_always</string> </key> - <value> <int>1</int> </value> - </item> - </dictionary> - </pickle> - </record> - <record id="2" aka="AAAAAAAAAAI="> - <pickle> - <tuple> - <tuple> - <string>Products.CMFCore.Expression</string> - <string>Expression</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>text</string> </key> - <value> <string>python:state_change.kwargs.get(\'stop_date\',state_change.object.getStopDate())</string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/worklists/assignee_confirmed_task.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/worklists/assignee_confirmed_task.xml index c1e3727d8c..7d14569be4 100644 --- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/worklists/assignee_confirmed_task.xml +++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/worklists/assignee_confirmed_task.xml @@ -96,14 +96,6 @@ task_report_module?simulation_state=confirmed&portal_type=Task+Report&local_role <key> <string>_container</string> </key> <value> <dictionary> - <item> - <key> <string>portal_type</string> </key> - <value> - <tuple> - <string>Task Report</string> - </tuple> - </value> - </item> <item> <key> <string>simulation_state</string> </key> <value> diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/worklists/assignee_started_task.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/worklists/assignee_started_task.xml index 100929d242..ea9de1a1bb 100644 --- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/worklists/assignee_started_task.xml +++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/worklists/assignee_started_task.xml @@ -30,7 +30,7 @@ <key> <string>actbox_url</string> </key> <value> <string encoding="cdata"><![CDATA[ -task_report_module?simulation_state=started&portal_type=Task+Report&local_roles=%(local_roles)s&reset=1 +task_report_module?simulation_state=started&portal_type=%(portal_type)s&local_roles=%(local_roles)s&reset=1 ]]></string> </value> </item> @@ -96,14 +96,6 @@ task_report_module?simulation_state=started&portal_type=Task+Report&local_roles= <key> <string>_container</string> </key> <value> <dictionary> - <item> - <key> <string>portal_type</string> </key> - <value> - <tuple> - <string>Task Report</string> - </tuple> - </value> - </item> <item> <key> <string>simulation_state</string> </key> <value> diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/worklists/assignor_confirmed_task.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/worklists/assignor_confirmed_task.xml index 8372cfbe78..7f55199bf9 100644 --- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/worklists/assignor_confirmed_task.xml +++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/worklists/assignor_confirmed_task.xml @@ -30,7 +30,7 @@ <key> <string>actbox_url</string> </key> <value> <string encoding="cdata"><![CDATA[ -task_report_module?simulation_state=confirmed&portal_type=Task+Report&local_roles=%(local_roles)s&reset=1 +task_report_module?simulation_state=confirmed&portal_type=%(portal_type)s&local_roles=%(local_roles)s&reset=1 ]]></string> </value> </item> @@ -96,14 +96,6 @@ task_report_module?simulation_state=confirmed&portal_type=Task+Report&local_role <key> <string>_container</string> </key> <value> <dictionary> - <item> - <key> <string>portal_type</string> </key> - <value> - <tuple> - <string>Task Report</string> - </tuple> - </value> - </item> <item> <key> <string>simulation_state</string> </key> <value> diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/worklists/assignor_started_task.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/worklists/assignor_started_task.xml index dd694f2d88..c1854911a6 100644 --- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/worklists/assignor_started_task.xml +++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/worklists/assignor_started_task.xml @@ -30,7 +30,7 @@ <key> <string>actbox_url</string> </key> <value> <string encoding="cdata"><![CDATA[ -task_report_module?simulation_state=started&portal_type=Task+Report&local_roles=%(local_roles)s&reset=1 +task_report_module?simulation_state=started&portal_type=%(portal_type)s&local_roles=%(local_roles)s&reset=1 ]]></string> </value> </item> @@ -96,14 +96,6 @@ task_report_module?simulation_state=started&portal_type=Task+Report&local_roles= <key> <string>_container</string> </key> <value> <dictionary> - <item> - <key> <string>portal_type</string> </key> - <value> - <tuple> - <string>Task Report</string> - </tuple> - </value> - </item> <item> <key> <string>simulation_state</string> </key> <value> diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/worklists/assignor_stopped_task.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/worklists/assignor_stopped_task.xml index 9e0cb2998b..4f983ef4a9 100644 --- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/worklists/assignor_stopped_task.xml +++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/worklists/assignor_stopped_task.xml @@ -30,7 +30,7 @@ <key> <string>actbox_url</string> </key> <value> <string encoding="cdata"><![CDATA[ -task_report_module?simulation_state=stopped&portal_type=Task+Report&local_roles=%(local_roles)s&reset=1 +task_report_module?simulation_state=stopped&portal_type=%(portal_type)s&local_roles=%(local_roles)s&reset=1 ]]></string> </value> </item> @@ -96,14 +96,6 @@ task_report_module?simulation_state=stopped&portal_type=Task+Report&local_roles= <key> <string>_container</string> </key> <value> <dictionary> - <item> - <key> <string>portal_type</string> </key> - <value> - <tuple> - <string>Task Report</string> - </tuple> - </value> - </item> <item> <key> <string>simulation_state</string> </key> <value> diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow.xml index fd9d550d44..30bd2eff2b 100644 --- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow.xml +++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow.xml @@ -30,6 +30,16 @@ <none/> </value> </item> + <item> + <key> <string>creation_guard</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string>The Task Workflow is a kind of order workflow so that one person (Assignor) can request a task to someone else (Assignee). Tasks can be planned, ordered and finally confirmed. Once a task is confirmed, it becomes read-only. Task management is then taken in charge by Task Reports and the Task Report workflow.</string> </value> + </item> <item> <key> <string>groups</string> </key> <value> @@ -44,6 +54,10 @@ <key> <string>initial_state</string> </key> <value> <string>draft</string> </value> </item> + <item> + <key> <string>manager_bypass</string> </key> + <value> <int>0</int> </value> + </item> <item> <key> <string>permissions</string> </key> <value> diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/states/auto_planned.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/states/auto_planned.xml index e05286b562..8ed63a0b71 100644 --- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/states/auto_planned.xml +++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/states/auto_planned.xml @@ -20,7 +20,7 @@ </item> <item> <key> <string>description</string> </key> - <value> <string></string> </value> + <value> <string>Tasks in \'Auto Planned\' state have been generated automatically by an MRP-like process. They are suggestions of tasks in order to meet the current production plan.</string> </value> </item> <item> <key> <string>id</string> </key> diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/states/cancelled.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/states/cancelled.xml index b797d06675..8a3726c698 100644 --- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/states/cancelled.xml +++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/states/cancelled.xml @@ -20,7 +20,7 @@ </item> <item> <key> <string>description</string> </key> - <value> <string></string> </value> + <value> <string>Cancelled tasks are tasks which have been cancelled by the user but which remain visible. Unlike deteled tasks, cancelled tasks may be tasks which were initially planned or ordered and were later cancelled.</string> </value> </item> <item> <key> <string>id</string> </key> @@ -78,11 +78,11 @@ <item> <key> <string>Access contents information</string> </key> <value> - <list> + <tuple> <string>Assignor</string> <string>Manager</string> <string>Owner</string> - </list> + </tuple> </value> </item> <item> @@ -100,11 +100,11 @@ <item> <key> <string>View</string> </key> <value> - <list> + <tuple> <string>Assignor</string> <string>Manager</string> <string>Owner</string> - </list> + </tuple> </value> </item> </dictionary> diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/states/confirmed.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/states/confirmed.xml index 377fbf8503..4fba43e884 100644 --- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/states/confirmed.xml +++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/states/confirmed.xml @@ -20,7 +20,7 @@ </item> <item> <key> <string>description</string> </key> - <value> <string></string> </value> + <value> <string>Confirmed tasks are tasks which the Assignor has confirmed and which will never be cancelled or modified.</string> </value> </item> <item> <key> <string>id</string> </key> @@ -42,6 +42,12 @@ <tuple/> </value> </item> + <item> + <key> <string>type_list</string> </key> + <value> + <tuple/> + </value> + </item> <item> <key> <string>uid</string> </key> <value> diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/states/deleted.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/states/deleted.xml new file mode 100644 index 0000000000..690ada4751 --- /dev/null +++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/states/deleted.xml @@ -0,0 +1,104 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <tuple> + <string>Products.DCWorkflow.States</string> + <string>StateDefinition</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>__ac_local_roles__</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string>Deleted tasks are draft tasks which were deleted by their owner or Assignor.</string> </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>deleted</string> </value> + </item> + <item> + <key> <string>permission_roles</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Deleted</string> </value> + </item> + <item> + <key> <string>transitions</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>type_list</string> </key> + <value> + <tuple/> + </value> + </item> + </dictionary> + </pickle> + </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <tuple> + <tuple> + <string>Persistence</string> + <string>PersistentMapping</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_container</string> </key> + <value> + <dictionary> + <item> + <key> <string>Access contents information</string> </key> + <value> + <tuple> + <string>Manager</string> + </tuple> + </value> + </item> + <item> + <key> <string>Add portal content</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>Modify portal content</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>View</string> </key> + <value> + <tuple> + <string>Manager</string> + </tuple> + </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/states/draft.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/states/draft.xml index a116e6dcb5..285c122248 100644 --- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/states/draft.xml +++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/states/draft.xml @@ -20,7 +20,7 @@ </item> <item> <key> <string>description</string> </key> - <value> <string></string> </value> + <value> <string>All tasks start in draft state. This is the state in which the user should define all task properties before submitting them through a workflow action or deleting them.</string> </value> </item> <item> <key> <string>id</string> </key> @@ -45,6 +45,8 @@ <string>cancel_action</string> <string>confirm</string> <string>confirm_action</string> + <string>delete</string> + <string>delete_action</string> <string>order</string> <string>order_action</string> <string>plan</string> diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/states/ordered.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/states/ordered.xml index 07a6a61889..7d440bc50f 100644 --- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/states/ordered.xml +++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/states/ordered.xml @@ -20,7 +20,7 @@ </item> <item> <key> <string>description</string> </key> - <value> <string></string> </value> + <value> <string>Ordered tasks are tasks which the Assignor ordered but which may still be modified (ex. date) before being confirmed.</string> </value> </item> <item> <key> <string>id</string> </key> diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/states/planned.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/states/planned.xml index 627feec406..6bdde6c980 100644 --- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/states/planned.xml +++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/states/planned.xml @@ -20,7 +20,7 @@ </item> <item> <key> <string>description</string> </key> - <value> <string></string> </value> + <value> <string>Planned tasks are tasks which an Assignor may be considering to request but which have not yet been formally requested.</string> </value> </item> <item> <key> <string>id</string> </key> diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/auto_plan.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/auto_plan.xml index 89bfa7360e..0013b3b4f2 100644 --- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/auto_plan.xml +++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/auto_plan.xml @@ -36,7 +36,7 @@ </item> <item> <key> <string>description</string> </key> - <value> <string></string> </value> + <value> <string>auto_plan is a workflow method which can be invoked from a script to set an object in auto_planned state.</string> </value> </item> <item> <key> <string>guard</string> </key> @@ -62,7 +62,7 @@ </item> <item> <key> <string>trigger_type</string> </key> - <value> <int>1</int> </value> + <value> <int>2</int> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/cancel.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/cancel.xml index 024824b3f3..453bc66f92 100644 --- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/cancel.xml +++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/cancel.xml @@ -36,7 +36,7 @@ </item> <item> <key> <string>description</string> </key> - <value> <string></string> </value> + <value> <string>cancel is a workflow method which can be invoked from a script to set an object in cancelled state.</string> </value> </item> <item> <key> <string>guard</string> </key> diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/cancel_action.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/cancel_action.xml index bdf25691e7..42070f288b 100644 --- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/cancel_action.xml +++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/cancel_action.xml @@ -36,7 +36,7 @@ </item> <item> <key> <string>description</string> </key> - <value> <string></string> </value> + <value> <string>The Assignor of a Task may cancel a task before it is confirmed by using the action.</string> </value> </item> <item> <key> <string>guard</string> </key> @@ -58,7 +58,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string></string> </value> + <value> <string>Cancel</string> </value> </item> <item> <key> <string>trigger_type</string> </key> @@ -90,7 +90,6 @@ <value> <tuple> <string>Assignor</string> - <string>Assignee</string> </tuple> </value> </item> diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/confirm.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/confirm.xml index 1727a34c42..856cb622b8 100644 --- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/confirm.xml +++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/confirm.xml @@ -36,7 +36,7 @@ </item> <item> <key> <string>description</string> </key> - <value> <string></string> </value> + <value> <string>confirm is a workflow method which can be invoked from a script to set an object in confirm state.</string> </value> </item> <item> <key> <string>guard</string> </key> diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/confirm_action.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/confirm_action.xml index b57c7d03b1..43aa41b8ba 100644 --- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/confirm_action.xml +++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/confirm_action.xml @@ -36,7 +36,7 @@ </item> <item> <key> <string>description</string> </key> - <value> <string></string> </value> + <value> <string>The Assignor of a Task may confirm a task and set it to read-only. Once a task is confirmed, a Task Report is generated to follow the execution of the task throuh an independent workflow: Task Report Workflow.</string> </value> </item> <item> <key> <string>guard</string> </key> @@ -58,7 +58,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string></string> </value> + <value> <string>Confirm</string> </value> </item> <item> <key> <string>trigger_type</string> </key> diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/delete.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/delete.xml new file mode 100644 index 0000000000..55de1c2e2e --- /dev/null +++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/delete.xml @@ -0,0 +1,70 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <tuple> + <string>Products.DCWorkflow.Transitions</string> + <string>TransitionDefinition</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>__ac_local_roles__</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>actbox_category</string> </key> + <value> <string>workflow</string> </value> + </item> + <item> + <key> <string>actbox_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>actbox_url</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>after_script_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string>delete is a workflow method which can be invoked from a script to set an object in deleted state.</string> </value> + </item> + <item> + <key> <string>guard</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>delete</string> </value> + </item> + <item> + <key> <string>new_state_id</string> </key> + <value> <string>deleted</string> </value> + </item> + <item> + <key> <string>script_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>trigger_type</string> </key> + <value> <int>2</int> </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/delete_action.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/delete_action.xml new file mode 100644 index 0000000000..39c0e83c5c --- /dev/null +++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/delete_action.xml @@ -0,0 +1,95 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <tuple> + <string>Products.DCWorkflow.Transitions</string> + <string>TransitionDefinition</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>__ac_local_roles__</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>actbox_category</string> </key> + <value> <string>workflow</string> </value> + </item> + <item> + <key> <string>actbox_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>actbox_url</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>after_script_name</string> </key> + <value> <string>delete</string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string>A draft task can be deleted by using the trash button.</string> </value> + </item> + <item> + <key> <string>guard</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>delete_action</string> </value> + </item> + <item> + <key> <string>new_state_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>script_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Delete</string> </value> + </item> + <item> + <key> <string>trigger_type</string> </key> + <value> <int>1</int> </value> + </item> + </dictionary> + </pickle> + </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <tuple> + <tuple> + <string>Products.DCWorkflow.Guard</string> + <string>Guard</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>roles</string> </key> + <value> + <tuple> + <string>Owner</string> + <string>Assignor</string> + <string>Manager</string> + </tuple> + </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/order.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/order.xml index b5fcd66200..43200d60e3 100644 --- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/order.xml +++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/order.xml @@ -36,7 +36,7 @@ </item> <item> <key> <string>description</string> </key> - <value> <string></string> </value> + <value> <string>order is a workflow method which can be invoked from a script to set an object in order state.</string> </value> </item> <item> <key> <string>guard</string> </key> diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/order_action.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/order_action.xml index ec54ae27cf..adf52fc987 100644 --- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/order_action.xml +++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/order_action.xml @@ -36,7 +36,7 @@ </item> <item> <key> <string>description</string> </key> - <value> <string></string> </value> + <value> <string>The Assignor of a Task may set a task a \'ordered\' by invoking the \'Order\' action. Ordered task still need to be confirmed before Task Report is generated.</string> </value> </item> <item> <key> <string>guard</string> </key> @@ -58,7 +58,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string></string> </value> + <value> <string>Order</string> </value> </item> <item> <key> <string>trigger_type</string> </key> diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/plan.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/plan.xml index 3168d0f1fc..873fc6a50f 100644 --- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/plan.xml +++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/plan.xml @@ -36,7 +36,7 @@ </item> <item> <key> <string>description</string> </key> - <value> <string></string> </value> + <value> <string>plan is a workflow method which can be invoked from a script to set an object in planned state.</string> </value> </item> <item> <key> <string>guard</string> </key> diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/plan_action.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/plan_action.xml index 4cf2f0371b..523bc41871 100644 --- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/plan_action.xml +++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/transitions/plan_action.xml @@ -36,7 +36,7 @@ </item> <item> <key> <string>description</string> </key> - <value> <string></string> </value> + <value> <string>A draft task which has a probability to be ordered or confirmed some day may be set as \'planned\' by invoking the \'Plan\' action.</string> </value> </item> <item> <key> <string>guard</string> </key> @@ -58,7 +58,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string></string> </value> + <value> <string>Plan</string> </value> </item> <item> <key> <string>trigger_type</string> </key> diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/variables/action.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/variables/action.xml index e2d54b25d7..51097ca9f1 100644 --- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/variables/action.xml +++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/variables/action.xml @@ -30,7 +30,7 @@ </item> <item> <key> <string>description</string> </key> - <value> <string></string> </value> + <value> <string>The ID of the workflow transition which was invoked.</string> </value> </item> <item> <key> <string>for_catalog</string> </key> diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/variables/actor.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/variables/actor.xml index b81346a188..fe4c5f83fb 100644 --- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/variables/actor.xml +++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/variables/actor.xml @@ -30,7 +30,7 @@ </item> <item> <key> <string>description</string> </key> - <value> <string></string> </value> + <value> <string>The ID of the user which invoked a transition.</string> </value> </item> <item> <key> <string>for_catalog</string> </key> diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/variables/comment.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/variables/comment.xml index 7b16912f74..795dab824f 100644 --- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/variables/comment.xml +++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/variables/comment.xml @@ -30,7 +30,7 @@ </item> <item> <key> <string>description</string> </key> - <value> <string></string> </value> + <value> <string>Comments posted by the user before invoking a transition.</string> </value> </item> <item> <key> <string>for_catalog</string> </key> diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/variables/error_message.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/variables/error_message.xml index 05f2a3ece8..7419cc9600 100644 --- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/variables/error_message.xml +++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/variables/error_message.xml @@ -30,7 +30,7 @@ </item> <item> <key> <string>description</string> </key> - <value> <string></string> </value> + <value> <string>Error message, if any, returned during the transition execution.</string> </value> </item> <item> <key> <string>for_catalog</string> </key> diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/variables/history.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/variables/history.xml index 2a212275cf..c0aac42319 100644 --- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/variables/history.xml +++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/variables/history.xml @@ -30,7 +30,7 @@ </item> <item> <key> <string>description</string> </key> - <value> <string></string> </value> + <value> <string>History of the workflow states, transitions, actors, errors, etc.</string> </value> </item> <item> <key> <string>for_catalog</string> </key> diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/variables/time.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/variables/time.xml index a389129998..932fcc9f63 100644 --- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/variables/time.xml +++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/variables/time.xml @@ -30,7 +30,7 @@ </item> <item> <key> <string>description</string> </key> - <value> <string></string> </value> + <value> <string>Time at which a transition was executed.</string> </value> </item> <item> <key> <string>for_catalog</string> </key> -- 2.30.9