Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Richard
erp5
Commits
05b1457f
Commit
05b1457f
authored
Jun 23, 2014
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixup! Mail Message: prevent sending email twice in case of conflict errors
parent
ee5f212f
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
2 deletions
+3
-2
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_sendEmail.xml
...nTemplateItem/portal_skins/erp5_base/Entity_sendEmail.xml
+1
-1
bt5/erp5_base/bt/revision
bt5/erp5_base/bt/revision
+1
-1
product/ERP5/tests/testCRM.py
product/ERP5/tests/testCRM.py
+1
-0
No files found.
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_sendEmail.xml
View file @
05b1457f
...
@@ -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
...
...
bt5/erp5_base/bt/revision
View file @
05b1457f
1064
1065
\ No newline at end of file
product/ERP5/tests/testCRM.py
View file @
05b1457f
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment