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
Labels
Merge Requests
137
Merge Requests
137
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
Jobs
Commits
Open sidebar
nexedi
erp5
Commits
997ab603
Commit
997ab603
authored
Mar 12, 2018
by
Nicolas Wavrant
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_base: use type based method to retrieve method to create posts
parent
9aabdd74
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
27 deletions
+8
-27
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_sendEmail.py
...inTemplateItem/portal_skins/erp5_base/Entity_sendEmail.py
+3
-13
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/MailMessage_send.py
...inTemplateItem/portal_skins/erp5_base/MailMessage_send.py
+5
-14
No files found.
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_sendEmail.py
View file @
997ab603
...
...
@@ -29,18 +29,8 @@ mail_message = portal.Base_createMailMessageAsString(
embedded_file_list
=
embedded_file_list
,
extra_header_dict
=
extra_header_dict
)
internet_message_post_module
=
portal
.
getDefaultModuleValue
(
'Internet Message Post'
,
None
)
if
internet_message_post_module
is
not
None
:
# erp5_interface_post is installed, so it is needed to track outgoing emails
internet_message_post
=
internet_message_post_module
.
newContent
(
portal_type
=
'Internet Message Post'
,
title
=
"Internet Message for %s"
%
event
.
getTitle
(),
reference
=
event
.
getReference
(),
data
=
mail_message
,
)
internet_message_post
.
allowExport
()
event_aggregate_list
=
event
.
getAggregateList
()
event_aggregate_list
.
append
(
internet_message_post
.
getRelativeUrl
())
event
.
setAggregateList
(
event_aggregate_list
)
create_post_message_method
=
event
.
getTypeBasedMethod
(
'createPostMessage'
)
if
create_post_message_method
:
create_post_message_method
(
mail_message
)
else
:
event
.
sendMailHostMessage
(
mail_message
)
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/MailMessage_send.py
View file @
997ab603
...
...
@@ -47,6 +47,9 @@ if not context.hasStartDate():
context
.
setStartDate
(
DateTime
())
if
download
or
not
use_activity
:
create_post_message_method
=
context
.
getTypeBasedMethod
(
'createPostMessage'
)
for
to_url
in
to_url_list
:
body
=
body
or
context
.
getTextContent
()
or
''
subject
=
subject
or
context
.
getTitle
()
or
''
...
...
@@ -79,20 +82,8 @@ if download or not use_activity:
embedded_file_list
=
embedded_file_list
,
extra_header_dict
=
extra_header_dict
)
internet_message_post_module
=
portal
.
getDefaultModuleValue
(
'Internet Message Post'
,
None
)
if
internet_message_post_module
is
not
None
:
# erp5_interface_post is installed, so it is needed to track outgoing emails
internet_message_post
=
internet_message_post_module
.
newContent
(
portal_type
=
'Internet Message Post'
,
title
=
"Internet Message for %s"
%
context
.
getTitle
(),
reference
=
context
.
getReference
(),
data
=
mail_message
,
)
internet_message_post
.
allowExport
()
mail_aggregate_list
=
context
.
getAggregateList
()
mail_aggregate_list
.
append
(
internet_message_post
.
getRelativeUrl
())
context
.
setAggregateList
(
mail_aggregate_list
)
if
create_post_message_method
:
create_post_message_method
(
mail_message
)
else
:
if
not
use_activity
:
context
.
activate
(
activity
=
'SQLQueue'
).
sendMailHostMessage
(
mail_message
)
...
...
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