diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_createRespondEvent.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_createRespondEvent.xml index 1445048909e59291731f5000228596e6df342ff9..becff8d35c130cb49227841de7974f014bf8729e 100644 --- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_createRespondEvent.xml +++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_createRespondEvent.xml @@ -53,7 +53,12 @@ </item> <item> <key> <string>_body</string> </key> - <value> <string># this script allows to create a new follow up ticket for a given event\n + <value> <string>"""\n + TODO: This script does not work now. This needs proxy role, but if proxified, then this script can be a security hole.\n + Because anyone can create an email and send to everywhere. (Yusei)\n +"""\n +\n +# this script allows to create a new follow up ticket for a given event\n event_object = context\n event_module = context.getPortalObject().getDefaultModule(respond_event_portal_type)\n # Create the outgoing\n diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewAcknowledgeActionDialog/your_create_event.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewAcknowledgeActionDialog/your_create_event.xml index b51dd4820354ffdc5787d5db009770e029e71173..567b5e2914319d5a11a9bf3163d300d8bfc85d78 100644 --- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewAcknowledgeActionDialog/your_create_event.xml +++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewAcknowledgeActionDialog/your_create_event.xml @@ -160,7 +160,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Create an event follow up current ticket</string> </value> + <value> <string>Create a New Event for Reply</string> </value> </item> </dictionary> </value> diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewNewEventDialog/your_description.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewNewEventDialog/your_description.xml index 3d14ea1004fb4d5110ca49c8eb7d7da7af87511e..e5682e56b9dd298150efb904bd4871479a388cde 100644 --- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewNewEventDialog/your_description.xml +++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewNewEventDialog/your_description.xml @@ -256,7 +256,7 @@ </item> <item> <key> <string>required</string> </key> - <value> <int>1</int> </value> + <value> <int>0</int> </value> </item> <item> <key> <string>title</string> </key> diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewNewEventDialog/your_portal_type.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewNewEventDialog/your_portal_type.xml index 225dbb294c40e27c4c145ae098de39b1b32fc4b0..904d6f0e73e190c5563c78d4aaf1cc98fab5a0a1 100644 --- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewNewEventDialog/your_portal_type.xml +++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewNewEventDialog/your_portal_type.xml @@ -267,18 +267,15 @@ <record id="2" aka="AAAAAAAAAAI="> <pickle> <tuple> - <tuple> - <string>Products.Formulator.TALESField</string> - <string>TALESMethod</string> - </tuple> - <none/> + <global name="TALESMethod" module="Products.Formulator.TALESField"/> + <tuple/> </tuple> </pickle> <pickle> <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>python:map(lambda x: (here.Localizer.erp5_ui.gettext(x), x), here.getPortalEventTypeList())</string> </value> + <value> <string>python:map(lambda x: (here.Base_translateString(x), x), here.getPortalEventTypeList())</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/worklists/1_new_events.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/worklists/1_new_events.xml index 93fac7b9cf1d1b2a6a89673cc8f00338c4ce443f..e321e32cb28096983e0a146b4e8f96a2333519aa 100644 --- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/worklists/1_new_events.xml +++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/worklists/1_new_events.xml @@ -51,11 +51,8 @@ event_module?simulation_state=new&portal_type=%(portal_type)s&local_roles=%(loca <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> @@ -65,6 +62,7 @@ event_module?simulation_state=new&portal_type=%(portal_type)s&local_roles=%(loca <value> <tuple> <string>Assignor</string> + <string>Assignee</string> </tuple> </value> </item> @@ -74,17 +72,14 @@ event_module?simulation_state=new&portal_type=%(portal_type)s&local_roles=%(loca <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_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/transitions/validate_action.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/transitions/validate_action.xml index 7520052514b6d725ac727cb72be9449fbd59aca1..bb8ea02fc5fa682fa7a8d4cca9f1212cffca7d52 100644 --- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/transitions/validate_action.xml +++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/transitions/validate_action.xml @@ -15,7 +15,7 @@ </item> <item> <key> <string>actbox_name</string> </key> - <value> <string>Validate</string> </value> + <value> <string>Get Contacted</string> </value> </item> <item> <key> <string>actbox_url</string> </key> diff --git a/bt5/erp5_crm/bt/change_log b/bt5/erp5_crm/bt/change_log index 115a53cbd346bd38afd4b7a4a205505758b5e4cd..5115110d6c78ab8337c91523ec893056b544d975 100644 --- a/bt5/erp5_crm/bt/change_log +++ b/bt5/erp5_crm/bt/change_log @@ -1,3 +1,10 @@ +2008-10-1 yusei +* Added comment to Event_createRespondEvent. +* Changed label message on acknowledge action dialog. +* Changed action box name title of validate_action transition on sale_opportunity_workflow. +* Description field on Ticket_viewNewEventDialog is not required now. +* Assignee can see the new incoming event worklist. + 2008-09-26 yusei * Fixed unauthorized error bug if deleted events exists. diff --git a/bt5/erp5_crm/bt/revision b/bt5/erp5_crm/bt/revision index e26ed8de06b5a9b25d370db9da4ad65bbc26f66b..0e92c3c0fc954ea08c56cf2c6b18bd68a0c7879b 100644 --- a/bt5/erp5_crm/bt/revision +++ b/bt5/erp5_crm/bt/revision @@ -1 +1 @@ -305 \ No newline at end of file +306 \ No newline at end of file