From ee4f1dde605fcacdc25b5bf19204c8fb8ea263a2 Mon Sep 17 00:00:00 2001
From: Romain Courteaud <romain@nexedi.com>
Date: Wed, 19 Mar 2008 10:34:01 +0000
Subject: [PATCH] Update task_workflow, in order to give permissions to
 Assignee

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@20024 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../task_workflow/states/auto_planned.xml     |   5 +
 .../task_workflow/states/cancelled.xml        |   4 +
 .../task_workflow/states/draft.xml            |   7 ++
 .../task_workflow/states/ordered.xml          |   3 +
 .../task_workflow/states/planned.xml          |   3 +
 .../transitions/cancel_action.xml             |   8 +-
 .../transitions/confirm_action.xml            |   8 +-
 .../transitions/delete_action.xml             |   9 +-
 .../transitions/order_action.xml              |   8 +-
 .../task_workflow/worklists/1_draft_task.xml  | 106 ++++++++++++++++++
 .../{planned_task.xml => 2_planned_task.xml}  |  22 ++--
 .../{ordered_task.xml => 3_ordered_task.xml}  |  23 ++--
 bt5/erp5_project/bt/revision                  |   2 +-
 13 files changed, 158 insertions(+), 50 deletions(-)
 create mode 100644 bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/worklists/1_draft_task.xml
 rename bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/worklists/{planned_task.xml => 2_planned_task.xml} (81%)
 rename bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/worklists/{ordered_task.xml => 3_ordered_task.xml} (81%)

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 c04229b8f9..6c57ac51c7 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
@@ -84,7 +84,9 @@
                     <key> <string>Add portal content</string> </key>
                     <value>
                       <tuple>
+                        <string>Assignee</string>
                         <string>Assignor</string>
+                        <string>Associate</string>
                         <string>Manager</string>
                       </tuple>
                     </value>
@@ -93,7 +95,9 @@
                     <key> <string>Delete objects</string> </key>
                     <value>
                       <tuple>
+                        <string>Assignee</string>
                         <string>Assignor</string>
+                        <string>Associate</string>
                         <string>Manager</string>
                       </tuple>
                     </value>
@@ -102,6 +106,7 @@
                     <key> <string>Modify portal content</string> </key>
                     <value>
                       <tuple>
+                        <string>Assignee</string>
                         <string>Assignor</string>
                         <string>Associate</string>
                         <string>Manager</string>
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 b7df4e6012..ee07634645 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
@@ -73,8 +73,10 @@
                     <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>
@@ -101,8 +103,10 @@
                     <key> <string>View</string> </key>
                     <value>
                       <tuple>
+                        <string>Assignee</string>
                         <string>Assignor</string>
                         <string>Associate</string>
+                        <string>Auditor</string>
                         <string>Manager</string>
                       </tuple>
                     </value>
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 4f0d1c0328..5a5b93d1cd 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
@@ -85,8 +85,10 @@
                     <key> <string>Access contents information</string> </key>
                     <value>
                       <tuple>
+                        <string>Assignee</string>
                         <string>Assignor</string>
                         <string>Associate</string>
+                        <string>Auditor</string>
                         <string>Manager</string>
                         <string>Owner</string>
                       </tuple>
@@ -96,6 +98,7 @@
                     <key> <string>Add portal content</string> </key>
                     <value>
                       <tuple>
+                        <string>Assignee</string>
                         <string>Assignor</string>
                         <string>Associate</string>
                         <string>Manager</string>
@@ -107,6 +110,7 @@
                     <key> <string>Delete objects</string> </key>
                     <value>
                       <tuple>
+                        <string>Assignee</string>
                         <string>Assignor</string>
                         <string>Associate</string>
                         <string>Manager</string>
@@ -118,6 +122,7 @@
                     <key> <string>Modify portal content</string> </key>
                     <value>
                       <tuple>
+                        <string>Assignee</string>
                         <string>Assignor</string>
                         <string>Associate</string>
                         <string>Manager</string>
@@ -129,8 +134,10 @@
                     <key> <string>View</string> </key>
                     <value>
                       <tuple>
+                        <string>Assignee</string>
                         <string>Assignor</string>
                         <string>Associate</string>
+                        <string>Auditor</string>
                         <string>Manager</string>
                         <string>Owner</string>
                       </tuple>
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 1e4518f37c..f6f3c3bf19 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
@@ -91,6 +91,7 @@
                     <key> <string>Add portal content</string> </key>
                     <value>
                       <tuple>
+                        <string>Assignee</string>
                         <string>Assignor</string>
                         <string>Associate</string>
                         <string>Manager</string>
@@ -101,6 +102,7 @@
                     <key> <string>Delete objects</string> </key>
                     <value>
                       <tuple>
+                        <string>Assignee</string>
                         <string>Assignor</string>
                         <string>Associate</string>
                         <string>Manager</string>
@@ -111,6 +113,7 @@
                     <key> <string>Modify portal content</string> </key>
                     <value>
                       <tuple>
+                        <string>Assignee</string>
                         <string>Assignor</string>
                         <string>Associate</string>
                         <string>Manager</string>
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 2f8f4ccdda..80c068ef23 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
@@ -93,6 +93,7 @@
                     <key> <string>Add portal content</string> </key>
                     <value>
                       <tuple>
+                        <string>Assignee</string>
                         <string>Assignor</string>
                         <string>Associate</string>
                         <string>Manager</string>
@@ -103,6 +104,7 @@
                     <key> <string>Delete objects</string> </key>
                     <value>
                       <tuple>
+                        <string>Assignee</string>
                         <string>Assignor</string>
                         <string>Associate</string>
                         <string>Manager</string>
@@ -113,6 +115,7 @@
                     <key> <string>Modify portal content</string> </key>
                     <value>
                       <tuple>
+                        <string>Assignee</string>
                         <string>Assignor</string>
                         <string>Associate</string>
                         <string>Manager</string>
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 bcc2df86d6..4f5f793145 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
@@ -73,11 +73,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>
@@ -87,6 +84,7 @@
             <value>
               <tuple>
                 <string>Assignor</string>
+                <string>Assignee</string>
               </tuple>
             </value>
         </item>
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 98ae0a3ded..0c2c36d7ef 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
@@ -73,11 +73,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>
@@ -87,6 +84,7 @@
             <value>
               <tuple>
                 <string>Assignor</string>
+                <string>Assignee</string>
               </tuple>
             </value>
         </item>
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
index 8d6121ba93..9d801537e3 100644
--- 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
@@ -67,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>
@@ -82,7 +79,7 @@
               <tuple>
                 <string>Owner</string>
                 <string>Assignor</string>
-                <string>Manager</string>
+                <string>Assignee</string>
               </tuple>
             </value>
         </item>
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 5b7c694707..ad2f19defd 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
@@ -73,11 +73,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>
@@ -87,6 +84,7 @@
             <value>
               <tuple>
                 <string>Assignor</string>
+                <string>Assignee</string>
               </tuple>
             </value>
         </item>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/worklists/1_draft_task.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/worklists/1_draft_task.xml
new file mode 100644
index 0000000000..5097c319ec
--- /dev/null
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/worklists/1_draft_task.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/>
+        <tuple/>
+      </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>global</string> </value>
+        </item>
+        <item>
+            <key> <string>actbox_name</string> </key>
+            <value> <string>Tasks to validate (%(count)s)</string> </value>
+        </item>
+        <item>
+            <key> <string>actbox_url</string> </key>
+            <value> <string encoding="cdata"><![CDATA[
+
+task_module?simulation_state=draft&local_roles=%(local_roles)s&reset=1
+
+]]></string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>Tasks to validate</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>1_draft_task</string> </value>
+        </item>
+        <item>
+            <key> <string>var_matches</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="Guard" module="Products.DCWorkflow.Guard"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>roles</string> </key>
+            <value>
+              <tuple>
+                <string>Assignor</string>
+                <string>Assignee</string>
+                <string>Owner</string>
+              </tuple>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>simulation_state</string> </key>
+                    <value>
+                      <tuple>
+                        <string>draft</string>
+                      </tuple>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/worklists/planned_task.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/worklists/2_planned_task.xml
similarity index 81%
rename from bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/worklists/planned_task.xml
rename to bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/worklists/2_planned_task.xml
index 67d40fc84e..18aa0a9583 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/worklists/planned_task.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/worklists/2_planned_task.xml
@@ -21,13 +21,13 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string>Planned Tasks (%(count)s)</string> </value>
+            <value> <string>Tasks to order (%(count)s)</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-task_module?simulation_state=planned&portal_type=%(portal_type)s&local_roles=%(local_roles)s&reset=1
+task_module?simulation_state=planned&local_roles=%(local_roles)s&reset=1
 
 ]]></string> </value>
         </item>
@@ -43,7 +43,7 @@ task_module?simulation_state=planned&portal_type=%(portal_type)s&local_roles=%(l
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>planned_task</string> </value>
+            <value> <string>2_planned_task</string> </value>
         </item>
         <item>
             <key> <string>var_matches</string> </key>
@@ -57,11 +57,8 @@ task_module?simulation_state=planned&portal_type=%(portal_type)s&local_roles=%(l
   <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>
@@ -81,17 +78,14 @@ task_module?simulation_state=planned&portal_type=%(portal_type)s&local_roles=%(l
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Persistence</string>
-          <string>PersistentMapping</string>
-        </tuple>
-        <none/>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
         <item>
-            <key> <string>_container</string> </key>
+            <key> <string>data</string> </key>
             <value>
               <dictionary>
                 <item>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/worklists/ordered_task.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/worklists/3_ordered_task.xml
similarity index 81%
rename from bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/worklists/ordered_task.xml
rename to bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/worklists/3_ordered_task.xml
index 07f12e8131..52ee68ceae 100644
--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/worklists/ordered_task.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/worklists/3_ordered_task.xml
@@ -21,13 +21,13 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string>Ordered Tasks (%(count)s)</string> </value>
+            <value> <string>Tasks to confirm (%(count)s)</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-task_module?simulation_state=ordered&portal_type=%(portal_type)s&local_roles=%(local_roles)s&reset=1
+task_module?simulation_state=ordered&local_roles=%(local_roles)s&reset=1
 
 ]]></string> </value>
         </item>
@@ -43,7 +43,7 @@ task_module?simulation_state=ordered&portal_type=%(portal_type)s&local_roles=%(l
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>ordered_task</string> </value>
+            <value> <string>3_ordered_task</string> </value>
         </item>
         <item>
             <key> <string>var_matches</string> </key>
@@ -57,11 +57,8 @@ task_module?simulation_state=ordered&portal_type=%(portal_type)s&local_roles=%(l
   <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>
@@ -71,6 +68,7 @@ task_module?simulation_state=ordered&portal_type=%(portal_type)s&local_roles=%(l
             <value>
               <tuple>
                 <string>Assignor</string>
+                <string>Assignee</string>
               </tuple>
             </value>
         </item>
@@ -80,17 +78,14 @@ task_module?simulation_state=ordered&portal_type=%(portal_type)s&local_roles=%(l
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Persistence</string>
-          <string>PersistentMapping</string>
-        </tuple>
-        <none/>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
         <item>
-            <key> <string>_container</string> </key>
+            <key> <string>data</string> </key>
             <value>
               <dictionary>
                 <item>
diff --git a/bt5/erp5_project/bt/revision b/bt5/erp5_project/bt/revision
index 2ae9f6c7cb..2be0b3c11a 100644
--- a/bt5/erp5_project/bt/revision
+++ b/bt5/erp5_project/bt/revision
@@ -1 +1 @@
-441
\ No newline at end of file
+442
\ No newline at end of file
-- 
2.30.9