Update task_report_workflow configuration: improve permissions and worklists

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@20021 20353a03-c40f-0410-a6d1-a30d3c3de9de

bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/states/cancelled.xml

@@ -65,11 +65,11 @@
                     <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>
                     </value>
                 </item>
@@ -95,11 +95,11 @@
                     <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>
                     </value>
                 </item>

bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/states/confirmed.xml

@@ -85,9 +85,7 @@
                         <string>Assignor</string>
                         <string>Associate</string>
                         <string>Auditor</string>
-                        <string>Author</string>
                         <string>Manager</string>
-                        <string>Owner</string>
                       </tuple>
                     </value>
                 </item>
@@ -97,6 +95,7 @@
                       <tuple>
                         <string>Assignee</string>
                         <string>Assignor</string>
+                        <string>Associate</string>
                         <string>Manager</string>
                       </tuple>
                     </value>
@@ -107,6 +106,7 @@
                       <tuple>
                         <string>Assignee</string>
                         <string>Assignor</string>
+                        <string>Associate</string>
                         <string>Manager</string>
                       </tuple>
                     </value>
@@ -130,9 +130,7 @@
                         <string>Assignor</string>
                         <string>Associate</string>
                         <string>Auditor</string>
-                        <string>Author</string>
                         <string>Manager</string>
-                        <string>Owner</string>
                       </tuple>
                     </value>
                 </item>

bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/states/draft.xml

@@ -43,8 +43,8 @@
                 <string>confirm_action</string>
                 <string>delete</string>
                 <string>delete_action</string>
-                <string>deliver</string>
-                <string>deliver_action</string>
+                <string>start</string>
+                <string>start_action</string>
                 <string>stop</string>
                 <string>stop_action</string>
               </tuple>
@@ -95,7 +95,9 @@
                     <key> <string>Add portal content</string> </key>
                     <value>
                       <tuple>
+                        <string>Assignee</string>
                         <string>Assignor</string>
+                        <string>Associate</string>
                         <string>Manager</string>
                         <string>Owner</string>
                       </tuple>
@@ -105,7 +107,9 @@
                     <key> <string>Delete objects</string> </key>
                     <value>
                       <tuple>
+                        <string>Assignee</string>
                         <string>Assignor</string>
+                        <string>Associate</string>
                         <string>Manager</string>
                         <string>Owner</string>
                       </tuple>
@@ -115,6 +119,7 @@
                     <key> <string>Modify portal content</string> </key>
                     <value>
                       <tuple>
+                        <string>Assignee</string>
                         <string>Assignor</string>
                         <string>Associate</string>
                         <string>Manager</string>

bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/states/started.xml

@@ -87,6 +87,7 @@
                       <tuple>
                         <string>Assignee</string>
                         <string>Assignor</string>
+                        <string>Associate</string>
                         <string>Manager</string>
                       </tuple>
                     </value>
@@ -97,6 +98,7 @@
                       <tuple>
                         <string>Assignee</string>
                         <string>Assignor</string>
+                        <string>Associate</string>
                         <string>Manager</string>
                       </tuple>
                     </value>

bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/states/stopped.xml

@@ -83,6 +83,7 @@
                     <value>
                       <tuple>
                         <string>Assignor</string>
+                        <string>Associate</string>
                         <string>Manager</string>
                       </tuple>
                     </value>
@@ -92,6 +93,7 @@
                     <value>
                       <tuple>
                         <string>Assignor</string>
+                        <string>Associate</string>
                         <string>Manager</string>
                       </tuple>
                     </value>

bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/worklists/assignor_started_task.xml → bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/worklists/1_draft_task_report_list.xml

@@ -21,19 +21,19 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string>Started Tasks (%(count)s)</string> </value>
+            <value> <string>Task Reports to validate (%(count)s)</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-task_report_module?simulation_state=started&portal_type=%(portal_type)s&local_roles=%(local_roles)s&reset=1
+task_report_module?simulation_state=confirmed&local_roles=%(local_roles)s&reset=1
 
 ]]></string> </value>
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string>Tasks assigned by a manager which are being processed</string> </value>
+            <value> <string>Task Reports to validate</string> </value>
         </item>
         <item>
             <key> <string>guard</string> </key>
@@ -43,7 +43,7 @@ task_report_module?simulation_state=started&portal_type=%(portal_type)s&local_ro
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>assignor_started_task</string> </value>
+            <value> <string>1_draft_task_report_list</string> </value>
         </item>
         <item>
             <key> <string>var_matches</string> </key>
@@ -57,11 +57,8 @@ task_report_module?simulation_state=started&portal_type=%(portal_type)s&local_ro
   <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>
@@ -70,7 +67,9 @@ task_report_module?simulation_state=started&portal_type=%(portal_type)s&local_ro
             <key> <string>roles</string> </key>
             <value>
               <tuple>
+                <string>Owner</string>
                 <string>Assignor</string>
+                <string>Assignee</string>
               </tuple>
             </value>
         </item>
@@ -80,24 +79,21 @@ task_report_module?simulation_state=started&portal_type=%(portal_type)s&local_ro
   <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>
                     <key> <string>simulation_state</string> </key>
                     <value>
                       <tuple>
-                        <string>started</string>
+                        <string>draft</string>
                       </tuple>
                     </value>
                 </item>

bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/worklists/assignee_confirmed_task.xml → bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/worklists/2_assignee_confirmed_task.xml

@@ -21,13 +21,13 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string>Assigned Tasks (%(count)s)</string> </value>
+            <value> <string>Tasks to start (%(count)s)</string> </value>
         </item>
         <item>
             <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=confirmedlocal_roles=%(local_roles)s&reset=1
 
 ]]></string> </value>
         </item>
@@ -43,7 +43,7 @@ task_report_module?simulation_state=confirmed&portal_type=Task+Report&local_role
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>assignee_confirmed_task</string> </value>
+            <value> <string>2_assignee_confirmed_task</string> </value>
         </item>
         <item>
             <key> <string>var_matches</string> </key>
@@ -57,11 +57,8 @@ task_report_module?simulation_state=confirmed&portal_type=Task+Report&local_role
   <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>
@@ -80,17 +77,14 @@ task_report_module?simulation_state=confirmed&portal_type=Task+Report&local_role
   <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>

bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/worklists/assignee_started_task.xml → bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/worklists/3_assignee_started_task.xml

@@ -21,13 +21,13 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string>Started Tasks (%(count)s)</string> </value>
+            <value> <string>Tasks to finish (%(count)s)</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-task_report_module?simulation_state=started&portal_type=%(portal_type)s&local_roles=%(local_roles)s&reset=1
+task_report_module?simulation_state=started&local_roles=%(local_roles)s&reset=1
 
 ]]></string> </value>
         </item>
@@ -43,7 +43,7 @@ task_report_module?simulation_state=started&portal_type=%(portal_type)s&local_ro
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>assignee_started_task</string> </value>
+            <value> <string>3_assignee_started_task</string> </value>
         </item>
         <item>
             <key> <string>var_matches</string> </key>
@@ -57,11 +57,8 @@ task_report_module?simulation_state=started&portal_type=%(portal_type)s&local_ro
   <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>
@@ -80,17 +77,14 @@ task_report_module?simulation_state=started&portal_type=%(portal_type)s&local_ro
   <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>

bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/worklists/assignor_confirmed_task.xml → bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/worklists/4_assignor_confirmed_task.xml

@@ -21,13 +21,13 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string>Assigned Tasks (%(count)s)</string> </value>
+            <value> <string>Tasks to follow (%(count)s)</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-task_report_module?simulation_state=confirmed&portal_type=%(portal_type)s&local_roles=%(local_roles)s&reset=1
+task_report_module?simulation_state:list=confirmed&simulation_state:list=started&local_roles=%(local_roles)s&reset=1
 
 ]]></string> </value>
         </item>
@@ -43,7 +43,7 @@ task_report_module?simulation_state=confirmed&portal_type=%(portal_type)s&local_
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>assignor_confirmed_task</string> </value>
+            <value> <string>4_assignor_confirmed_task</string> </value>
         </item>
         <item>
             <key> <string>var_matches</string> </key>
@@ -57,11 +57,8 @@ task_report_module?simulation_state=confirmed&portal_type=%(portal_type)s&local_
   <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>
@@ -80,17 +77,14 @@ task_report_module?simulation_state=confirmed&portal_type=%(portal_type)s&local_
   <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>
@@ -98,6 +92,7 @@ task_report_module?simulation_state=confirmed&portal_type=%(portal_type)s&local_
                     <value>
                       <tuple>
                         <string>confirmed</string>
+                        <string>started</string>
                       </tuple>
                     </value>
                 </item>

bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/worklists/assignor_stopped_task.xml → bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/worklists/5_assignor_stopped_task.xml

@@ -21,13 +21,13 @@
         </item>
         <item>
             <key> <string>actbox_name</string> </key>
-            <value> <string>Finished Tasks (%(count)s)</string> </value>
+            <value> <string>Tasks to close (%(count)s)</string> </value>
         </item>
         <item>
             <key> <string>actbox_url</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-task_report_module?simulation_state=stopped&portal_type=%(portal_type)s&local_roles=%(local_roles)s&reset=1
+task_report_module?simulation_state=stopped&local_roles=%(local_roles)s&reset=1
 
 ]]></string> </value>
         </item>
@@ -43,7 +43,7 @@ task_report_module?simulation_state=stopped&portal_type=%(portal_type)s&local_ro
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>assignor_stopped_task</string> </value>
+            <value> <string>5_assignor_stopped_task</string> </value>
         </item>
         <item>
             <key> <string>var_matches</string> </key>
@@ -57,11 +57,8 @@ task_report_module?simulation_state=stopped&portal_type=%(portal_type)s&local_ro
   <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>
@@ -80,17 +77,14 @@ task_report_module?simulation_state=stopped&portal_type=%(portal_type)s&local_ro
   <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>

bt5/erp5_project/bt/revision

-440
+441
\ No newline at end of file