From f2b2c8d5c01e77c933848936a4f3a07fe6ffb868 Mon Sep 17 00:00:00 2001 From: Nicolas Delaby <nicolas@nexedi.com> Date: Fri, 3 Jun 2011 16:26:29 +0200 Subject: [PATCH] Update Ticket worklist - Update action Messages - improve marshalling of URL parameters - fix typo --- .../worklists/0A_draft_campaign_list.xml | 26 ++++++----------- .../worklists/0B_submitted_campaign_list.xml | 26 ++++++----------- .../worklists/0C_open_campaign_list.xml | 26 ++++++----------- .../worklists/1A_draft_meeting_list.xml | 26 ++++++----------- .../worklists/1B_submitted_meeting_list.xml | 26 ++++++----------- .../worklists/1C_open_meeting_list.xml | 26 ++++++----------- .../2A_draft_support_request_list.xml | 26 ++++++----------- .../2B_submitted_support_request_list.xml | 28 +++++++------------ .../2C_open_support_request_list.xml | 26 ++++++----------- bt5/erp5_crm/bt/revision | 2 +- 10 files changed, 83 insertions(+), 155 deletions(-) diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/0A_draft_campaign_list.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/0A_draft_campaign_list.xml index 32a5469395..7874a2f0ea 100644 --- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/0A_draft_campaign_list.xml +++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/0A_draft_campaign_list.xml @@ -10,15 +10,19 @@ <key> <string>actbox_category</string> </key> <value> <string>global</string> </value> </item> + <item> + <key> <string>actbox_icon</string> </key> + <value> <string></string> </value> + </item> <item> <key> <string>actbox_name</string> </key> - <value> <string>Draft Campaigns (%(count)s)</string> </value> + <value> <string>Campaigns to Submit (%(count)s)</string> </value> </item> <item> <key> <string>actbox_url</string> </key> <value> <string encoding="cdata"><![CDATA[ -campaign_module?simulation_state=draft&portal_type=%(portal_type)s&local_roles=%(local_roles)s&reset=1 +campaign_module?simulation_state=draft&portal_type:list=%(portal_type)s&local_roles:list=%(local_roles)s&reset:int=1 ]]></string> </value> </item> @@ -47,13 +51,7 @@ campaign_module?simulation_state=draft&portal_type=%(portal_type)s&local_roles=% </record> <record id="2" aka="AAAAAAAAAAI="> <pickle> - <tuple> - <tuple> - <string>Products.DCWorkflow.Guard</string> - <string>Guard</string> - </tuple> - <none/> - </tuple> + <global name="Guard" module="Products.DCWorkflow.Guard"/> </pickle> <pickle> <dictionary> @@ -70,18 +68,12 @@ campaign_module?simulation_state=draft&portal_type=%(portal_type)s&local_roles=% </record> <record id="3" aka="AAAAAAAAAAM="> <pickle> - <tuple> - <tuple> - <string>Persistence</string> - <string>PersistentMapping</string> - </tuple> - <none/> - </tuple> + <global name="PersistentMapping" module="Persistence.mapping"/> </pickle> <pickle> <dictionary> <item> - <key> <string>_container</string> </key> + <key> <string>data</string> </key> <value> <dictionary> <item> diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/0B_submitted_campaign_list.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/0B_submitted_campaign_list.xml index f89cbc38f5..20e4f08391 100644 --- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/0B_submitted_campaign_list.xml +++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/0B_submitted_campaign_list.xml @@ -10,15 +10,19 @@ <key> <string>actbox_category</string> </key> <value> <string>global</string> </value> </item> + <item> + <key> <string>actbox_icon</string> </key> + <value> <string></string> </value> + </item> <item> <key> <string>actbox_name</string> </key> - <value> <string>Submitted Campaigns (%(count)s)</string> </value> + <value> <string>Campaigns to Open (%(count)s)</string> </value> </item> <item> <key> <string>actbox_url</string> </key> <value> <string encoding="cdata"><![CDATA[ -campaign_module?simulation_state=submitted&portal_type=%(portal_type)s&local_roles=%(local_roles)s&reset=1 +campaign_module?simulation_state=submitted&portal_type:list=%(portal_type)s&local_roles:list=%(local_roles)s&reset:int=1 ]]></string> </value> </item> @@ -47,13 +51,7 @@ campaign_module?simulation_state=submitted&portal_type=%(portal_type)s&local_rol </record> <record id="2" aka="AAAAAAAAAAI="> <pickle> - <tuple> - <tuple> - <string>Products.DCWorkflow.Guard</string> - <string>Guard</string> - </tuple> - <none/> - </tuple> + <global name="Guard" module="Products.DCWorkflow.Guard"/> </pickle> <pickle> <dictionary> @@ -70,18 +68,12 @@ campaign_module?simulation_state=submitted&portal_type=%(portal_type)s&local_rol </record> <record id="3" aka="AAAAAAAAAAM="> <pickle> - <tuple> - <tuple> - <string>Persistence</string> - <string>PersistentMapping</string> - </tuple> - <none/> - </tuple> + <global name="PersistentMapping" module="Persistence.mapping"/> </pickle> <pickle> <dictionary> <item> - <key> <string>_container</string> </key> + <key> <string>data</string> </key> <value> <dictionary> <item> diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/0C_open_campaign_list.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/0C_open_campaign_list.xml index 77ae0aee0e..42d0e31432 100644 --- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/0C_open_campaign_list.xml +++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/0C_open_campaign_list.xml @@ -10,15 +10,19 @@ <key> <string>actbox_category</string> </key> <value> <string>global</string> </value> </item> + <item> + <key> <string>actbox_icon</string> </key> + <value> <string></string> </value> + </item> <item> <key> <string>actbox_name</string> </key> - <value> <string>Open Campaigns (%(count)s)</string> </value> + <value> <string>Campaigns to Close (%(count)s)</string> </value> </item> <item> <key> <string>actbox_url</string> </key> <value> <string encoding="cdata"><![CDATA[ -campaign_module?simulation_state=validated&portal_type=%(portal_type)s&local_roles=%(local_roles)s&reset=1 +campaign_module?simulation_state=validated&portal_type:list=%(portal_type)s&local_roles:list=%(local_roles)s&reset:int=1 ]]></string> </value> </item> @@ -47,13 +51,7 @@ campaign_module?simulation_state=validated&portal_type=%(portal_type)s&local_rol </record> <record id="2" aka="AAAAAAAAAAI="> <pickle> - <tuple> - <tuple> - <string>Products.DCWorkflow.Guard</string> - <string>Guard</string> - </tuple> - <none/> - </tuple> + <global name="Guard" module="Products.DCWorkflow.Guard"/> </pickle> <pickle> <dictionary> @@ -71,18 +69,12 @@ campaign_module?simulation_state=validated&portal_type=%(portal_type)s&local_rol </record> <record id="3" aka="AAAAAAAAAAM="> <pickle> - <tuple> - <tuple> - <string>Persistence</string> - <string>PersistentMapping</string> - </tuple> - <none/> - </tuple> + <global name="PersistentMapping" module="Persistence.mapping"/> </pickle> <pickle> <dictionary> <item> - <key> <string>_container</string> </key> + <key> <string>data</string> </key> <value> <dictionary> <item> diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/1A_draft_meeting_list.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/1A_draft_meeting_list.xml index 83abe48dbc..1f5a2a8ec8 100644 --- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/1A_draft_meeting_list.xml +++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/1A_draft_meeting_list.xml @@ -10,15 +10,19 @@ <key> <string>actbox_category</string> </key> <value> <string>global</string> </value> </item> + <item> + <key> <string>actbox_icon</string> </key> + <value> <string></string> </value> + </item> <item> <key> <string>actbox_name</string> </key> - <value> <string>Draft Meetings (%(count)s)</string> </value> + <value> <string>Meetings to Submit (%(count)s)</string> </value> </item> <item> <key> <string>actbox_url</string> </key> <value> <string encoding="cdata"><![CDATA[ -meeting_module?simulation_state=draft&portal_type=%(portal_type)s&local_roles=%(local_roles)s&reset=1 +meeting_module?simulation_state=draft&portal_type:list=%(portal_type)s&local_roles:list=%(local_roles)s&reset:int=1 ]]></string> </value> </item> @@ -47,13 +51,7 @@ meeting_module?simulation_state=draft&portal_type=%(portal_type)s&local_roles=%( </record> <record id="2" aka="AAAAAAAAAAI="> <pickle> - <tuple> - <tuple> - <string>Products.DCWorkflow.Guard</string> - <string>Guard</string> - </tuple> - <none/> - </tuple> + <global name="Guard" module="Products.DCWorkflow.Guard"/> </pickle> <pickle> <dictionary> @@ -70,18 +68,12 @@ meeting_module?simulation_state=draft&portal_type=%(portal_type)s&local_roles=%( </record> <record id="3" aka="AAAAAAAAAAM="> <pickle> - <tuple> - <tuple> - <string>Persistence</string> - <string>PersistentMapping</string> - </tuple> - <none/> - </tuple> + <global name="PersistentMapping" module="Persistence.mapping"/> </pickle> <pickle> <dictionary> <item> - <key> <string>_container</string> </key> + <key> <string>data</string> </key> <value> <dictionary> <item> diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/1B_submitted_meeting_list.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/1B_submitted_meeting_list.xml index 7b25e3d05e..3cf773c78b 100644 --- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/1B_submitted_meeting_list.xml +++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/1B_submitted_meeting_list.xml @@ -10,15 +10,19 @@ <key> <string>actbox_category</string> </key> <value> <string>global</string> </value> </item> + <item> + <key> <string>actbox_icon</string> </key> + <value> <string></string> </value> + </item> <item> <key> <string>actbox_name</string> </key> - <value> <string>Submitted Meetings (%(count)s)</string> </value> + <value> <string>Meetings to Open (%(count)s)</string> </value> </item> <item> <key> <string>actbox_url</string> </key> <value> <string encoding="cdata"><![CDATA[ -meeting_module?simulation_state=submitted&portal_type=%(portal_type)s&local_roles=%(local_roles)s&reset=1 +meeting_module?simulation_state=submitted&portal_type:list=%(portal_type)s&local_roles:list=%(local_roles)s&reset:int=1 ]]></string> </value> </item> @@ -47,13 +51,7 @@ meeting_module?simulation_state=submitted&portal_type=%(portal_type)s&local_role </record> <record id="2" aka="AAAAAAAAAAI="> <pickle> - <tuple> - <tuple> - <string>Products.DCWorkflow.Guard</string> - <string>Guard</string> - </tuple> - <none/> - </tuple> + <global name="Guard" module="Products.DCWorkflow.Guard"/> </pickle> <pickle> <dictionary> @@ -70,18 +68,12 @@ meeting_module?simulation_state=submitted&portal_type=%(portal_type)s&local_role </record> <record id="3" aka="AAAAAAAAAAM="> <pickle> - <tuple> - <tuple> - <string>Persistence</string> - <string>PersistentMapping</string> - </tuple> - <none/> - </tuple> + <global name="PersistentMapping" module="Persistence.mapping"/> </pickle> <pickle> <dictionary> <item> - <key> <string>_container</string> </key> + <key> <string>data</string> </key> <value> <dictionary> <item> diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/1C_open_meeting_list.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/1C_open_meeting_list.xml index 6a5ade616e..871b84be4d 100644 --- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/1C_open_meeting_list.xml +++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/1C_open_meeting_list.xml @@ -10,15 +10,19 @@ <key> <string>actbox_category</string> </key> <value> <string>global</string> </value> </item> + <item> + <key> <string>actbox_icon</string> </key> + <value> <string></string> </value> + </item> <item> <key> <string>actbox_name</string> </key> - <value> <string>Open Meetings (%(count)s)</string> </value> + <value> <string>Meetings to Close (%(count)s)</string> </value> </item> <item> <key> <string>actbox_url</string> </key> <value> <string encoding="cdata"><![CDATA[ -meeting_module?simulation_state=validated&portal_type=%(portal_type)s&local_roles=%(local_roles)s&reset=1 +meeting_module?simulation_state=validated&portal_type:list=%(portal_type)s&local_roles:list=%(local_roles)s&reset:int=1 ]]></string> </value> </item> @@ -47,13 +51,7 @@ meeting_module?simulation_state=validated&portal_type=%(portal_type)s&local_role </record> <record id="2" aka="AAAAAAAAAAI="> <pickle> - <tuple> - <tuple> - <string>Products.DCWorkflow.Guard</string> - <string>Guard</string> - </tuple> - <none/> - </tuple> + <global name="Guard" module="Products.DCWorkflow.Guard"/> </pickle> <pickle> <dictionary> @@ -71,18 +69,12 @@ meeting_module?simulation_state=validated&portal_type=%(portal_type)s&local_role </record> <record id="3" aka="AAAAAAAAAAM="> <pickle> - <tuple> - <tuple> - <string>Persistence</string> - <string>PersistentMapping</string> - </tuple> - <none/> - </tuple> + <global name="PersistentMapping" module="Persistence.mapping"/> </pickle> <pickle> <dictionary> <item> - <key> <string>_container</string> </key> + <key> <string>data</string> </key> <value> <dictionary> <item> diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/2A_draft_support_request_list.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/2A_draft_support_request_list.xml index 2d6967f3b8..6c96b1cc6b 100644 --- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/2A_draft_support_request_list.xml +++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/2A_draft_support_request_list.xml @@ -10,15 +10,19 @@ <key> <string>actbox_category</string> </key> <value> <string>global</string> </value> </item> + <item> + <key> <string>actbox_icon</string> </key> + <value> <string></string> </value> + </item> <item> <key> <string>actbox_name</string> </key> - <value> <string>Draft Support Requests (%(count)s)</string> </value> + <value> <string>Support Requests to Submit (%(count)s)</string> </value> </item> <item> <key> <string>actbox_url</string> </key> <value> <string encoding="cdata"><![CDATA[ -support_request_module?simulation_state=draft&portal_type=%(portal_type)s&local_roles=%(local_roles)s&reset=1 +support_request_module?simulation_state=draft&portal_type:list=%(portal_type)s&local_roles:list=%(local_roles)s&reset:int=1 ]]></string> </value> </item> @@ -47,13 +51,7 @@ support_request_module?simulation_state=draft&portal_type=%(portal_type)s&local_ </record> <record id="2" aka="AAAAAAAAAAI="> <pickle> - <tuple> - <tuple> - <string>Products.DCWorkflow.Guard</string> - <string>Guard</string> - </tuple> - <none/> - </tuple> + <global name="Guard" module="Products.DCWorkflow.Guard"/> </pickle> <pickle> <dictionary> @@ -70,18 +68,12 @@ support_request_module?simulation_state=draft&portal_type=%(portal_type)s&local_ </record> <record id="3" aka="AAAAAAAAAAM="> <pickle> - <tuple> - <tuple> - <string>Persistence</string> - <string>PersistentMapping</string> - </tuple> - <none/> - </tuple> + <global name="PersistentMapping" module="Persistence.mapping"/> </pickle> <pickle> <dictionary> <item> - <key> <string>_container</string> </key> + <key> <string>data</string> </key> <value> <dictionary> <item> diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/2B_submitted_support_request_list.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/2B_submitted_support_request_list.xml index f8ecce8c7d..d4e27599f7 100644 --- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/2B_submitted_support_request_list.xml +++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/2B_submitted_support_request_list.xml @@ -10,15 +10,19 @@ <key> <string>actbox_category</string> </key> <value> <string>global</string> </value> </item> + <item> + <key> <string>actbox_icon</string> </key> + <value> <string></string> </value> + </item> <item> <key> <string>actbox_name</string> </key> - <value> <string>Submitted Support Requests (%(count)s)</string> </value> + <value> <string>Support Requests to Open (%(count)s)</string> </value> </item> <item> <key> <string>actbox_url</string> </key> <value> <string encoding="cdata"><![CDATA[ -support_request_module?simulation_state=submitted&portal_type=%(portal_type)s&local_roles=%(local_roles)s&reset=1 +support_request_module?simulation_state=submitted&portal_type:list=%(portal_type)s&local_roles:list=%(local_roles)s&reset:int=1 ]]></string> </value> </item> @@ -47,13 +51,7 @@ support_request_module?simulation_state=submitted&portal_type=%(portal_type)s&lo </record> <record id="2" aka="AAAAAAAAAAI="> <pickle> - <tuple> - <tuple> - <string>Products.DCWorkflow.Guard</string> - <string>Guard</string> - </tuple> - <none/> - </tuple> + <global name="Guard" module="Products.DCWorkflow.Guard"/> </pickle> <pickle> <dictionary> @@ -70,25 +68,19 @@ support_request_module?simulation_state=submitted&portal_type=%(portal_type)s&lo </record> <record id="3" aka="AAAAAAAAAAM="> <pickle> - <tuple> - <tuple> - <string>Persistence</string> - <string>PersistentMapping</string> - </tuple> - <none/> - </tuple> + <global name="PersistentMapping" module="Persistence.mapping"/> </pickle> <pickle> <dictionary> <item> - <key> <string>_container</string> </key> + <key> <string>data</string> </key> <value> <dictionary> <item> <key> <string>portal_type</string> </key> <value> <tuple> - <string>Support Requests</string> + <string>Support Request</string> </tuple> </value> </item> diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/2C_open_support_request_list.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/2C_open_support_request_list.xml index 41fbbca7ee..fd0dc8febe 100644 --- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/2C_open_support_request_list.xml +++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/worklists/2C_open_support_request_list.xml @@ -10,15 +10,19 @@ <key> <string>actbox_category</string> </key> <value> <string>global</string> </value> </item> + <item> + <key> <string>actbox_icon</string> </key> + <value> <string></string> </value> + </item> <item> <key> <string>actbox_name</string> </key> - <value> <string>Open Support Requests (%(count)s)</string> </value> + <value> <string>Support Requests to Close (%(count)s)</string> </value> </item> <item> <key> <string>actbox_url</string> </key> <value> <string encoding="cdata"><![CDATA[ -support_request_module?simulation_state=validated&portal_type=%(portal_type)s&local_roles=%(local_roles)s&reset=1 +support_request_module?simulation_state=validated&portal_type:list=%(portal_type)s&local_roles:list=%(local_roles)s&reset:int=1 ]]></string> </value> </item> @@ -47,13 +51,7 @@ support_request_module?simulation_state=validated&portal_type=%(portal_type)s&lo </record> <record id="2" aka="AAAAAAAAAAI="> <pickle> - <tuple> - <tuple> - <string>Products.DCWorkflow.Guard</string> - <string>Guard</string> - </tuple> - <none/> - </tuple> + <global name="Guard" module="Products.DCWorkflow.Guard"/> </pickle> <pickle> <dictionary> @@ -71,18 +69,12 @@ support_request_module?simulation_state=validated&portal_type=%(portal_type)s&lo </record> <record id="3" aka="AAAAAAAAAAM="> <pickle> - <tuple> - <tuple> - <string>Persistence</string> - <string>PersistentMapping</string> - </tuple> - <none/> - </tuple> + <global name="PersistentMapping" module="Persistence.mapping"/> </pickle> <pickle> <dictionary> <item> - <key> <string>_container</string> </key> + <key> <string>data</string> </key> <value> <dictionary> <item> diff --git a/bt5/erp5_crm/bt/revision b/bt5/erp5_crm/bt/revision index b1ce634589..55a318f19d 100644 --- a/bt5/erp5_crm/bt/revision +++ b/bt5/erp5_crm/bt/revision @@ -1 +1 @@ -550 \ No newline at end of file +551 \ No newline at end of file -- 2.30.9