From da3292dd95dcf5593ab80037387010b825402675 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com> Date: Mon, 17 Mar 2008 17:28:01 +0000 Subject: [PATCH] generate URLs with /view and explicitly pass local_roles=, variable substitution does not seem to work git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@19968 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../worklists/1_draft_person_list.xml | 18 ++++++------------ .../worklists/2_draft_organisation_list.xml | 18 ++++++------------ .../3_draft_purchase_trade_condition_list.xml | 2 +- .../worklists/4_draft_product_list.xml | 2 +- .../worklists/5_draft_service_list.xml | 2 +- product/ERP5/bootstrap/erp5_core/bt/revision | 2 +- 6 files changed, 16 insertions(+), 28 deletions(-) diff --git a/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/validation_workflow/worklists/1_draft_person_list.xml b/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/validation_workflow/worklists/1_draft_person_list.xml index 8109fdd102..ac89fd3441 100644 --- a/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/validation_workflow/worklists/1_draft_person_list.xml +++ b/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/validation_workflow/worklists/1_draft_person_list.xml @@ -27,7 +27,7 @@ <key> <string>actbox_url</string> </key> <value> <string encoding="cdata"><![CDATA[ -person_module?validation_state=draft&local_roles=%(local_roles)s&reset=1 +person_module/view?validation_state=draft&local_roles:list=Assignee&local_roles:list=Assignor&reset=1 ]]></string> </value> </item> @@ -63,11 +63,8 @@ person_module?validation_state=draft&local_roles=%(local_roles)s&reset=1 <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,17 +84,14 @@ person_module?validation_state=draft&local_roles=%(local_roles)s&reset=1 <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/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/validation_workflow/worklists/2_draft_organisation_list.xml b/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/validation_workflow/worklists/2_draft_organisation_list.xml index 1eb24eca33..ca8a503e4e 100644 --- a/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/validation_workflow/worklists/2_draft_organisation_list.xml +++ b/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/validation_workflow/worklists/2_draft_organisation_list.xml @@ -27,7 +27,7 @@ <key> <string>actbox_url</string> </key> <value> <string encoding="cdata"><![CDATA[ -organisation_module?validation_state=draft&local_roles=%(local_roles)s&reset=1 +organisation_module/view?validation_state=draft&local_roles:list=Assignee&local_roles:list=Assignor&reset=1 ]]></string> </value> </item> @@ -57,11 +57,8 @@ organisation_module?validation_state=draft&local_roles=%(local_roles)s&reset=1 <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 @@ organisation_module?validation_state=draft&local_roles=%(local_roles)s&reset=1 <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/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/validation_workflow/worklists/3_draft_purchase_trade_condition_list.xml b/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/validation_workflow/worklists/3_draft_purchase_trade_condition_list.xml index e87742263e..b0f54f2d47 100644 --- a/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/validation_workflow/worklists/3_draft_purchase_trade_condition_list.xml +++ b/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/validation_workflow/worklists/3_draft_purchase_trade_condition_list.xml @@ -27,7 +27,7 @@ <key> <string>actbox_url</string> </key> <value> <string encoding="cdata"><![CDATA[ -purchase_trade_condition_module?validation_state=draft&local_roles=%(local_roles)s&reset=1 +purchase_trade_condition_module/view?validation_state=draft&local_roles:list=Assignee&local_roles:list=Assignor&reset=1 ]]></string> </value> </item> diff --git a/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/validation_workflow/worklists/4_draft_product_list.xml b/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/validation_workflow/worklists/4_draft_product_list.xml index 67be22d7e2..bfa0078acb 100644 --- a/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/validation_workflow/worklists/4_draft_product_list.xml +++ b/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/validation_workflow/worklists/4_draft_product_list.xml @@ -27,7 +27,7 @@ <key> <string>actbox_url</string> </key> <value> <string encoding="cdata"><![CDATA[ -product_module?validation_state=draft&local_roles=%(local_roles)s&reset=1 +product_module/view?validation_state=draft&local_roles:list=Assignee&local_roles:list=Assignor&reset=1 ]]></string> </value> </item> diff --git a/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/validation_workflow/worklists/5_draft_service_list.xml b/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/validation_workflow/worklists/5_draft_service_list.xml index c624553f86..4914ca4fe1 100644 --- a/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/validation_workflow/worklists/5_draft_service_list.xml +++ b/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/validation_workflow/worklists/5_draft_service_list.xml @@ -27,7 +27,7 @@ <key> <string>actbox_url</string> </key> <value> <string encoding="cdata"><![CDATA[ -service_module?validation_state=draft&local_roles=%(local_roles)s&reset=1 +service_module/view?validation_state=draft&local_roles:list=Assignee&local_roles:list=Assignor&reset=1 ]]></string> </value> </item> diff --git a/product/ERP5/bootstrap/erp5_core/bt/revision b/product/ERP5/bootstrap/erp5_core/bt/revision index 8c28da60d7..5cd7ca2206 100644 --- a/product/ERP5/bootstrap/erp5_core/bt/revision +++ b/product/ERP5/bootstrap/erp5_core/bt/revision @@ -1 +1 @@ -747 \ No newline at end of file +748 \ No newline at end of file -- 2.30.9