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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
erp5
Commits
d2668da6
Commit
d2668da6
authored
Mar 22, 2016
by
Jérome Perrin
Committed by
Tristan Cavelier
Apr 12, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
base: update code relying on incorrect default value of person.getTitle
parent
4e5e9a0f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_sendEmail.py
...inTemplateItem/portal_skins/erp5_base/Entity_sendEmail.py
+2
-2
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/MailMessage_send.py
...inTemplateItem/portal_skins/erp5_base/MailMessage_send.py
+2
-2
No files found.
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_sendEmail.py
View file @
d2668da6
...
...
@@ -8,11 +8,11 @@ sender = event.getSourceValue()
if
kw
.
get
(
"from_url"
)
is
not
None
:
from_url
=
kw
.
get
(
"from_url"
)
elif
sender
is
not
None
:
from_url
=
formataddr
((
sender
.
getTitle
(),
sender
.
getDefaultEmailText
()))
from_url
=
formataddr
((
sender
.
hasTitle
()
and
sender
.
getTitle
(),
sender
.
getDefaultEmailText
()))
else
:
from_url
=
portal
.
portal_preferences
.
getPreferredEventSenderEmail
()
to_url
=
formataddr
((
context
.
getTitle
(),
context
.
getDefaultEmailText
()))
to_url
=
formataddr
((
context
.
hasTitle
()
and
context
.
getTitle
(),
context
.
getDefaultEmailText
()))
document_type_list
=
list
(
event
.
getPortalEmbeddedDocumentTypeList
())
+
list
(
event
.
getPortalDocumentTypeList
())
embedded_file_list
=
event
.
getAggregateValueList
(
portal_type
=
document_type_list
)
...
...
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/MailMessage_send.py
View file @
d2668da6
...
...
@@ -35,7 +35,7 @@ if to_url is None:
for
recipient
in
context
.
getDestinationValueList
():
email
=
recipient
.
getDefaultEmailText
()
if
email
:
to_url_list
.
append
(
formataddr
((
recipient
.
getTitle
(),
recipient
.
getDefaultEmailText
())))
to_url_list
.
append
(
formataddr
((
recipient
.
hasTitle
()
and
recipient
.
getTitle
(),
recipient
.
getDefaultEmailText
())))
else
:
# MailMessage portal type is supposed to have a constraint to report this
# to the user earlier
...
...
@@ -55,7 +55,7 @@ if download or not use_activity:
if
from_url
is
None
:
sender
=
context
.
getSourceValue
()
if
sender
is
not
None
:
from_url
=
formataddr
((
sender
.
getTitle
(),
sender
.
getDefaultEmailText
()))
from_url
=
formataddr
((
sender
.
hasTitle
()
and
sender
.
getTitle
(),
sender
.
getDefaultEmailText
()))
else
:
from_url
=
portal
.
portal_preferences
.
getPreferredEventSenderEmail
()
if
not
from_url
:
...
...
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