From b634531bf3fb3869cb7e2e645f97919eee8f2634 Mon Sep 17 00:00:00 2001 From: Nicolas Delaby <nicolas@nexedi.com> Date: Mon, 21 Jul 2008 16:40:00 +0000 Subject: [PATCH] Use same content type as Original Email git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@22607 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../portal_skins/erp5_crm/Event_createRespondEvent.xml | 5 ++--- bt5/erp5_crm/bt/revision | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) 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 1709649611..ae6a99a950 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 @@ -79,7 +79,7 @@ respond_event = event_module.newContent(\n causality=context.getRelativeUrl(),\n follow_up=context.getFollowUp(),\n text_content=respond_event_text_content,\n - text_format=\'text/plain\'\n + text_format=context.getTextFormat()\n )\n \n # Change the state to posted\n @@ -88,7 +88,7 @@ respond_event.start()\n if respond_event.portal_type==\'Mail Message\' and respond_event.getSource():\n respond_event.send()\n else:\n - respond_event.send(mfrom=object.portal_preferences.getPreferredEventSenderEmail())\n + respond_event.send(mfrom=context.portal_preferences.getPreferredEventSenderEmail())\n </string> </value> </item> <item> @@ -147,7 +147,6 @@ else:\n <string>event_module</string> <string>DateTime</string> <string>respond_event</string> - <string>object</string> </tuple> </value> </item> diff --git a/bt5/erp5_crm/bt/revision b/bt5/erp5_crm/bt/revision index 65de5029b4..3d9983adab 100644 --- a/bt5/erp5_crm/bt/revision +++ b/bt5/erp5_crm/bt/revision @@ -1 +1 @@ -294 \ No newline at end of file +295 \ No newline at end of file -- 2.30.9