From f1a8876a483c67afde5b31c9118ed07916be6b70 Mon Sep 17 00:00:00 2001
From: Fabien Morin <fabien@nexedi.com>
Date: Mon, 14 Dec 2009 11:54:45 +0000
Subject: [PATCH] change a bit the workflow security : give more rights to the
associate. Change worklists url to use an dynamic expression instead of
repeat role in role box and in url box, this should avoid some human errors.
reviewed and approved by Romain
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@31276 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
.../portal_workflow/apparel_model_workflow/states/quoting.xml | 3 +++
.../transitions/ask_for_quotation_action.xml | 1 +
.../apparel_model_workflow/worklists/10_refused_model_list.xml | 2 +-
.../apparel_model_workflow/worklists/1_draft_model_list.xml | 2 +-
.../apparel_model_workflow/worklists/2_proposed_model_list.xml | 2 +-
.../apparel_model_workflow/worklists/3_quoting_model_list.xml | 3 ++-
.../apparel_model_workflow/worklists/4_modeling_model_list.xml | 2 +-
.../apparel_model_workflow/worklists/5_designed_model_list.xml | 2 +-
.../worklists/6_prototyping_model_list.xml | 2 +-
.../apparel_model_workflow/worklists/7_approved_model_list.xml | 3 ++-
.../apparel_model_workflow/worklists/8_analysed_model_list.xml | 2 +-
.../apparel_model_workflow/worklists/9_priced_model_list.xml | 2 +-
bt5/erp5_apparel/bt/revision | 2 +-
13 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_model_workflow/states/quoting.xml b/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_model_workflow/states/quoting.xml
index 57757c2809..c13859eab2 100644
--- a/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_model_workflow/states/quoting.xml
+++ b/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_model_workflow/states/quoting.xml
@@ -78,6 +78,7 @@
<tuple>
<string>Assignee</string>
<string>Assignor</string>
+ <string>Associate</string>
<string>Manager</string>
</tuple>
</value>
@@ -88,6 +89,7 @@
<tuple>
<string>Assignee</string>
<string>Assignor</string>
+ <string>Associate</string>
<string>Manager</string>
</tuple>
</value>
@@ -98,6 +100,7 @@
<tuple>
<string>Assignee</string>
<string>Assignor</string>
+ <string>Associate</string>
<string>Manager</string>
</tuple>
</value>
diff --git a/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_model_workflow/transitions/ask_for_quotation_action.xml b/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_model_workflow/transitions/ask_for_quotation_action.xml
index 7de0de1478..c4cb076bea 100644
--- a/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_model_workflow/transitions/ask_for_quotation_action.xml
+++ b/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_model_workflow/transitions/ask_for_quotation_action.xml
@@ -72,6 +72,7 @@
<value>
<tuple>
<string>Assignor</string>
+ <string>Associate</string>
</tuple>
</value>
</item>
diff --git a/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_model_workflow/worklists/10_refused_model_list.xml b/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_model_workflow/worklists/10_refused_model_list.xml
index 1b14a27dec..f3f946f03a 100644
--- a/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_model_workflow/worklists/10_refused_model_list.xml
+++ b/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_model_workflow/worklists/10_refused_model_list.xml
@@ -21,7 +21,7 @@
<key> <string>actbox_url</string> </key>
<value> <string encoding="cdata"><![CDATA[
-apparel_model_module/view?validation_state=refused&local_roles:list=Assignor&reset=1
+apparel_model_module/view?validation_state=refused&local_roles=%(local_roles)s&reset=1
]]></string> </value>
</item>
diff --git a/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_model_workflow/worklists/1_draft_model_list.xml b/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_model_workflow/worklists/1_draft_model_list.xml
index a61d98a962..257ef3bb0e 100644
--- a/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_model_workflow/worklists/1_draft_model_list.xml
+++ b/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_model_workflow/worklists/1_draft_model_list.xml
@@ -21,7 +21,7 @@
<key> <string>actbox_url</string> </key>
<value> <string encoding="cdata"><![CDATA[
-apparel_model_module/view?validation_state=draft&local_roles:list=Owner&reset=1
+apparel_model_module/view?validation_state=draft&local_roles=%(local_roles)s&reset=1
]]></string> </value>
</item>
diff --git a/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_model_workflow/worklists/2_proposed_model_list.xml b/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_model_workflow/worklists/2_proposed_model_list.xml
index d9eb57bc14..83a32b4469 100644
--- a/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_model_workflow/worklists/2_proposed_model_list.xml
+++ b/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_model_workflow/worklists/2_proposed_model_list.xml
@@ -21,7 +21,7 @@
<key> <string>actbox_url</string> </key>
<value> <string encoding="cdata"><![CDATA[
-apparel_model_module/view?validation_state=proposed&local_roles:list=Assignor&reset=1
+apparel_model_module/view?validation_state=proposed&local_roles=%(local_roles)s&reset=1
]]></string> </value>
</item>
diff --git a/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_model_workflow/worklists/3_quoting_model_list.xml b/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_model_workflow/worklists/3_quoting_model_list.xml
index c47345b377..e58bef88bf 100644
--- a/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_model_workflow/worklists/3_quoting_model_list.xml
+++ b/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_model_workflow/worklists/3_quoting_model_list.xml
@@ -21,7 +21,7 @@
<key> <string>actbox_url</string> </key>
<value> <string encoding="cdata"><![CDATA[
-apparel_model_module/view?validation_state=quoting&local_roles:list=Assignor&reset=1
+apparel_model_module/view?validation_state=quoting&local_roles=%(local_roles)s&reset=1
]]></string> </value>
</item>
@@ -62,6 +62,7 @@ apparel_model_module/view?validation_state=quoting&local_roles:list=Assignor&res
<value>
<tuple>
<string>Assignor</string>
+ <string>Associate</string>
</tuple>
</value>
</item>
diff --git a/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_model_workflow/worklists/4_modeling_model_list.xml b/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_model_workflow/worklists/4_modeling_model_list.xml
index 558921f315..a1691c2a99 100644
--- a/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_model_workflow/worklists/4_modeling_model_list.xml
+++ b/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_model_workflow/worklists/4_modeling_model_list.xml
@@ -21,7 +21,7 @@
<key> <string>actbox_url</string> </key>
<value> <string encoding="cdata"><![CDATA[
-apparel_model_module/view?validation_state=modeling&local_roles:list=Assignee&reset=1
+apparel_model_module/view?validation_state=modeling&local_roles=%(local_roles)s&reset=1
]]></string> </value>
</item>
diff --git a/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_model_workflow/worklists/5_designed_model_list.xml b/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_model_workflow/worklists/5_designed_model_list.xml
index 860bd73dd8..1209736da4 100644
--- a/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_model_workflow/worklists/5_designed_model_list.xml
+++ b/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_model_workflow/worklists/5_designed_model_list.xml
@@ -21,7 +21,7 @@
<key> <string>actbox_url</string> </key>
<value> <string encoding="cdata"><![CDATA[
-apparel_model_module/view?validation_state=designed&local_roles:list=Assignor&local_roles:list=Assignee&reset=1
+apparel_model_module/view?validation_state=designed&local_roles=%(local_roles)s&reset=1
]]></string> </value>
</item>
diff --git a/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_model_workflow/worklists/6_prototyping_model_list.xml b/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_model_workflow/worklists/6_prototyping_model_list.xml
index be5aaf86fc..e748d63e85 100644
--- a/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_model_workflow/worklists/6_prototyping_model_list.xml
+++ b/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_model_workflow/worklists/6_prototyping_model_list.xml
@@ -21,7 +21,7 @@
<key> <string>actbox_url</string> </key>
<value> <string encoding="cdata"><![CDATA[
-apparel_model_module/view?validation_state=prototyping&local_roles:list=Assignor&local_roles:list=Assignee&reset=1
+apparel_model_module/view?validation_state=prototyping&local_roles=%(local_roles)s&reset=1
]]></string> </value>
</item>
diff --git a/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_model_workflow/worklists/7_approved_model_list.xml b/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_model_workflow/worklists/7_approved_model_list.xml
index 6060799def..b64d564866 100644
--- a/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_model_workflow/worklists/7_approved_model_list.xml
+++ b/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_model_workflow/worklists/7_approved_model_list.xml
@@ -21,7 +21,7 @@
<key> <string>actbox_url</string> </key>
<value> <string encoding="cdata"><![CDATA[
-apparel_model_module/view?validation_state=approved&local_roles:list=Assignee&reset=1
+apparel_model_module/view?validation_state=approved&local_roles=%(local_roles)s&reset=1
]]></string> </value>
</item>
@@ -62,6 +62,7 @@ apparel_model_module/view?validation_state=approved&local_roles:list=Assignee&re
<value>
<tuple>
<string>Assignee</string>
+ <string>Associate</string>
</tuple>
</value>
</item>
diff --git a/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_model_workflow/worklists/8_analysed_model_list.xml b/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_model_workflow/worklists/8_analysed_model_list.xml
index 5914701e1a..7b1fb6f276 100644
--- a/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_model_workflow/worklists/8_analysed_model_list.xml
+++ b/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_model_workflow/worklists/8_analysed_model_list.xml
@@ -21,7 +21,7 @@
<key> <string>actbox_url</string> </key>
<value> <string encoding="cdata"><![CDATA[
-apparel_model_module/view?validation_state=analysed&local_roles:list=Assignor&reset=1
+apparel_model_module/view?validation_state=analysed&local_roles=%(local_roles)s&reset=1
]]></string> </value>
</item>
diff --git a/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_model_workflow/worklists/9_priced_model_list.xml b/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_model_workflow/worklists/9_priced_model_list.xml
index 98e47877c8..dcbafdeb67 100644
--- a/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_model_workflow/worklists/9_priced_model_list.xml
+++ b/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_model_workflow/worklists/9_priced_model_list.xml
@@ -21,7 +21,7 @@
<key> <string>actbox_url</string> </key>
<value> <string encoding="cdata"><![CDATA[
-apparel_model_module/view?validation_state=priced&local_roles:list=Assignor&reset=1
+apparel_model_module/view?validation_state=priced&local_roles=%(local_roles)s&reset=1
]]></string> </value>
</item>
diff --git a/bt5/erp5_apparel/bt/revision b/bt5/erp5_apparel/bt/revision
index 7371afb09c..06690d5eea 100644
--- a/bt5/erp5_apparel/bt/revision
+++ b/bt5/erp5_apparel/bt/revision
@@ -1 +1 @@
-236
\ No newline at end of file
+238
\ No newline at end of file
--
2.30.9