From 6d286dea49717025ce415db335ca438bce7b638f Mon Sep 17 00:00:00 2001 From: Yusei Tahara <yusei@nexedi.com> Date: Fri, 6 Jun 2008 11:47:38 +0000 Subject: [PATCH] 2008-06-06 yusei * In Event_send, invoke transition only when portal type is available (it means crm portal types are installed). git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@21379 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../portal_skins/erp5_crm/Event_send.xml | 14 +++++++------- bt5/erp5_crm/bt/change_log | 3 +++ bt5/erp5_crm/bt/revision | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_send.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_send.xml index c8f1758e8c..60c4a0b537 100644 --- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_send.xml +++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_send.xml @@ -67,12 +67,6 @@ <key> <string>_body</string> </key> <value> <string encoding="cdata"><![CDATA[ -# Transit event workflow\n -if \'event_workflow\' in context.portal_workflow.getWorkflowsFor(context):\n - context.plan()\n - context.order()\n - context.start()\n -\n if body is None:\n body = context.getTextContent() #XXX This does not support structured text format.\n \n @@ -145,6 +139,12 @@ for to_url in to_url_list:\n \n context.setData(mail_message)\n \n +# Transit event workflow\n +if context.getTypeInfo() is not None:\n + context.plan()\n + context.order()\n + context.start()\n +\n if download:\n return mail_message\n @@ -206,9 +206,9 @@ if download:\n <string>attachment_list</string> <string>download</string> <string>kw</string> + <string>None</string> <string>_getattr_</string> <string>context</string> - <string>None</string> <string>sender</string> <string>additional_headers</string> <string>to_url_list</string> diff --git a/bt5/erp5_crm/bt/change_log b/bt5/erp5_crm/bt/change_log index 1e2ddb82e5..cb4d1b0536 100644 --- a/bt5/erp5_crm/bt/change_log +++ b/bt5/erp5_crm/bt/change_log @@ -1,3 +1,6 @@ +2008-06-06 yusei +* In Event_send, invoke transition only when portal type is available (it means crm portal types are installed). + 2008-06-04 * Add rights for manager in : sale_opportunity_workflow : Contacted, Cancelled diff --git a/bt5/erp5_crm/bt/revision b/bt5/erp5_crm/bt/revision index ce83bd94b3..9754915269 100644 --- a/bt5/erp5_crm/bt/revision +++ b/bt5/erp5_crm/bt/revision @@ -1 +1 @@ -258 \ No newline at end of file +259 \ No newline at end of file -- 2.30.9