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

05b1457f · Jérome Perrin · ee5f212f · 05b1457f · 05b1457f · 05b1457f
Commit 05b1457f authored 10 years ago by Jérome Perrin
3 changed files
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_sendEmail.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_sendEmail.xml
@@ -84,7 +84,7 @@ mail_message = portal.Base_createMailMessageAsString(from_url,\n
 \n
 event.sendMailHostMessage(mail_message)\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
  # the email that was actually sent.\n
  # We do not store when there is more than one recipent.\n

--- a/bt5/erp5_base/bt/revision
+++ b/bt5/erp5_base/bt/revision
-1064
\ No newline at end of file
+1065
--- a/product/ERP5/tests/testCRM.py
+++ b/product/ERP5/tests/testCRM.py
@@ -1116,6 +1116,7 @@ class TestCRMMailSend(BaseTestCRM):

    # The getTextContent() gets the content from the file data instead the
    # Attribute text_content.
+    self.assertTrue(event.hasFile())
    self.assertEqual(event.text_content, text_content)
    text_content_from_data = '<html><body>Hello<br />World</body></html>'
    self.assertEqual(event.getTextContent(), text_content_from_data)