Commit 5d552ce8 authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

fix two regressions (support attachments, support sending to persons that are not yet indexed).

parent 2c3200d1
...@@ -64,6 +64,7 @@ elif event.getSource() is not None:\n ...@@ -64,6 +64,7 @@ elif event.getSource() is not None:\n
from_url = formataddr((sender.getTitle(), sender.getDefaultEmailText()))\n from_url = formataddr((sender.getTitle(), sender.getDefaultEmailText()))\n
else:\n else:\n
from_url = portal.portal_preferences.getPreferredEventSenderEmail()\n from_url = portal.portal_preferences.getPreferredEventSenderEmail()\n
attachment_list = kw.pop(\'attachment_list\', [])\n
\n \n
to_url = formataddr((context.getTitle(), context.getDefaultEmailText()))\n to_url = formataddr((context.getTitle(), context.getDefaultEmailText()))\n
\n \n
...@@ -76,7 +77,7 @@ mail_message = context.Base_createMailMessageAsString(from_url,\n ...@@ -76,7 +77,7 @@ mail_message = context.Base_createMailMessageAsString(from_url,\n
subject,\n subject,\n
body,\n body,\n
content_type,\n content_type,\n
attachment_list=[],\n attachment_list=attachment_list,\n
embedded_file_list=embedded_file_list)\n embedded_file_list=embedded_file_list)\n
\n \n
event.sendMailHostMessage(mail_message)\n event.sendMailHostMessage(mail_message)\n
......
...@@ -54,6 +54,8 @@ ...@@ -54,6 +54,8 @@
from email import message_from_string\n from email import message_from_string\n
portal = context.getPortalObject()\n portal = context.getPortalObject()\n
\n \n
if attachment_list is None:\n
attachment_list = []\n
use_activity = False\n use_activity = False\n
mail_message = None\n mail_message = None\n
to_url_list = []\n to_url_list = []\n
...@@ -95,8 +97,6 @@ if download or not use_activity:\n ...@@ -95,8 +97,6 @@ if download or not use_activity:\n
additional_headers = {\'Return-Path\':reply_url}\n additional_headers = {\'Return-Path\':reply_url}\n
\n \n
# Attachments\n # Attachments\n
if attachment_list is None:\n
attachment_list = []\n
document_type_list = list(context.getPortalEmbeddedDocumentTypeList()) + list(context.getPortalDocumentTypeList())\n document_type_list = list(context.getPortalEmbeddedDocumentTypeList()) + list(context.getPortalDocumentTypeList())\n
embedded_file_list = context.getAggregateValueList(portal_type=document_type_list)\n embedded_file_list = context.getAggregateValueList(portal_type=document_type_list)\n
\n \n
...@@ -115,10 +115,16 @@ if download or not use_activity:\n ...@@ -115,10 +115,16 @@ if download or not use_activity:\n
context.activate(activity=\'SQLQueue\').sendMailHostMessage(mail_message)\n context.activate(activity=\'SQLQueue\').sendMailHostMessage(mail_message)\n
\n \n
if use_activity:\n if use_activity:\n
uid_list = context.getDestinationUidList()\n destination_list = context.getDestinationValueList()\n
path_list = [x.getPath() for x in destination_list]\n
uid_list = [x.getUid() for x in destination_list]\n
method_kw = dict(event_relative_url=context.getRelativeUrl(),\n method_kw = dict(event_relative_url=context.getRelativeUrl(),\n
from_url=from_url)\n from_url=from_url,\n
portal.portal_catalog.searchAndActivate(method_id="Entity_sendEmail",\n attachment_list=attachment_list)\n
portal.portal_catalog.activate(\n
after_path_and_method_id=(path_list, \n
(\'immediateReindexObject\', \'recursiveImmediateReindexObject\'))).searchAndActivate(\n
method_id="Entity_sendEmail",\n
uid=uid_list,\n uid=uid_list,\n
method_kw=method_kw, **kw)\n method_kw=method_kw, **kw)\n
\n \n
......
1023 1024
\ No newline at end of file \ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment