Commit 05b1457f authored by Jérome Perrin's avatar Jérome Perrin

fixup! Mail Message: prevent sending email twice in case of conflict errors

parent ee5f212f
...@@ -84,7 +84,7 @@ mail_message = portal.Base_createMailMessageAsString(from_url,\n ...@@ -84,7 +84,7 @@ mail_message = portal.Base_createMailMessageAsString(from_url,\n
\n \n
event.sendMailHostMessage(mail_message)\n event.sendMailHostMessage(mail_message)\n
\n \n
if not event.hasData() and len(event.getDestinationList()) > 1:\n if not event.hasData() and len(event.getDestinationList()) == 1:\n
# Store the content of the email as data, so that we can keep a reference to\n # Store the content of the email as data, so that we can keep a reference to\n
# the email that was actually sent.\n # the email that was actually sent.\n
# We do not store when there is more than one recipent.\n # We do not store when there is more than one recipent.\n
......
1064 1065
\ No newline at end of file
...@@ -1116,6 +1116,7 @@ class TestCRMMailSend(BaseTestCRM): ...@@ -1116,6 +1116,7 @@ class TestCRMMailSend(BaseTestCRM):
# The getTextContent() gets the content from the file data instead the # The getTextContent() gets the content from the file data instead the
# Attribute text_content. # Attribute text_content.
self.assertTrue(event.hasFile())
self.assertEqual(event.text_content, text_content) self.assertEqual(event.text_content, text_content)
text_content_from_data = '<html><body>Hello<br />World</body></html>' text_content_from_data = '<html><body>Hello<br />World</body></html>'
self.assertEqual(event.getTextContent(), text_content_from_data) self.assertEqual(event.getTextContent(), text_content_from_data)
......
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