From aded39e72b5ba828a2e5944165d756961f483ef2 Mon Sep 17 00:00:00 2001
From: Yusei Tahara <yusei@nexedi.com>
Date: Wed, 14 May 2008 16:34:06 +0000
Subject: [PATCH] Store entire mail message in data property when sending.
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@20969 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
product/ERP5/Document/EmailDocument.py | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/product/ERP5/Document/EmailDocument.py b/product/ERP5/Document/EmailDocument.py
index e0382a1b8a..02361d560a 100644
--- a/product/ERP5/Document/EmailDocument.py
+++ b/product/ERP5/Document/EmailDocument.py
@@ -251,12 +251,15 @@ class EmailDocument(File, TextDocument):
TODO: add support for legacy objects
"""
- if not self.hasFile():
+ if not self.hasFile() or self._baseGetTextContent() is not None:
# Return the standard text content if no file was provided
+ # Or standard text content is not empty.
if default is _MARKER:
return self._baseGetTextContent()
else:
return self._baseGetTextContent(default)
+
+ # find from mail message
text_result = None
html_result = None
for part in self._getMessage().walk():
@@ -405,6 +408,7 @@ class EmailDocument(File, TextDocument):
#
# Build mail message
+ # This part will be replaced with MailTemplate soon.
#
if body is None:
body = self.asText()
@@ -501,6 +505,9 @@ class EmailDocument(File, TextDocument):
mail_message = mime_message.as_string()
self.activate().sendMailHostMessage(mail_message)
+ # Save one of mail messages.
+ self.setData(mail_message)
+
# Only for debugging purpose
if download:
return mail_message
@@ -515,4 +522,3 @@ class EmailDocument(File, TextDocument):
## Compatibility layer
#from Products.ERP5Type import Document
#Document.MailMessage = EmailDocument
-
--
2.30.9