Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
E
erp5_workflow
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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wenjie.zheng
erp5_workflow
Commits
18916db7
Commit
18916db7
authored
May 24, 2012
by
Kazuhiko Shiozaki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix a regression (support attachments).
parent
14c5f927
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
5 deletions
+7
-5
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_sendEmail.xml
...nTemplateItem/portal_skins/erp5_base/Entity_sendEmail.xml
+2
-1
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Event_send.xml
...se/SkinTemplateItem/portal_skins/erp5_base/Event_send.xml
+4
-3
bt5/erp5_base/bt/revision
bt5/erp5_base/bt/revision
+1
-1
No files found.
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_sendEmail.xml
View file @
18916db7
...
@@ -64,6 +64,7 @@ elif event.getSource() is not None:\n
...
@@ -64,6 +64,7 @@ elif event.getSource() is not None:\n
from_url = formataddr((sender.getTitle(), sender.getDefaultEmailText()))\n
from_url = formataddr((sender.getTitle(), sender.getDefaultEmailText()))\n
else:\n
else:\n
from_url = portal.portal_preferences.getPreferredEventSenderEmail()\n
from_url = portal.portal_preferences.getPreferredEventSenderEmail()\n
attachment_list = kw.pop(\'attachment_list\', [])\n
\n
\n
to_url = formataddr((context.getTitle(), context.getDefaultEmailText()))\n
to_url = formataddr((context.getTitle(), context.getDefaultEmailText()))\n
\n
\n
...
@@ -76,7 +77,7 @@ mail_message = context.Base_createMailMessageAsString(from_url,\n
...
@@ -76,7 +77,7 @@ mail_message = context.Base_createMailMessageAsString(from_url,\n
subject,\n
subject,\n
body,\n
body,\n
content_type,\n
content_type,\n
attachment_list=
[]
,\n
attachment_list=
attachment_list
,\n
embedded_file_list=embedded_file_list)\n
embedded_file_list=embedded_file_list)\n
\n
\n
event.sendMailHostMessage(mail_message)\n
event.sendMailHostMessage(mail_message)\n
...
...
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Event_send.xml
View file @
18916db7
...
@@ -54,6 +54,8 @@
...
@@ -54,6 +54,8 @@
from email import message_from_string\n
from email import message_from_string\n
portal = context.getPortalObject()\n
portal = context.getPortalObject()\n
\n
\n
if attachment_list is None:\n
attachment_list = []\n
use_activity = False\n
use_activity = False\n
mail_message = None\n
mail_message = None\n
to_url_list = []\n
to_url_list = []\n
...
@@ -95,8 +97,6 @@ if download or not use_activity:\n
...
@@ -95,8 +97,6 @@ if download or not use_activity:\n
additional_headers = {\'Return-Path\':reply_url}\n
additional_headers = {\'Return-Path\':reply_url}\n
\n
\n
# Attachments\n
# Attachments\n
if attachment_list is None:\n
attachment_list = []\n
document_type_list = list(context.getPortalEmbeddedDocumentTypeList()) + list(context.getPortalDocumentTypeList())\n
document_type_list = list(context.getPortalEmbeddedDocumentTypeList()) + list(context.getPortalDocumentTypeList())\n
embedded_file_list = context.getAggregateValueList(portal_type=document_type_list)\n
embedded_file_list = context.getAggregateValueList(portal_type=document_type_list)\n
\n
\n
...
@@ -117,7 +117,8 @@ if download or not use_activity:\n
...
@@ -117,7 +117,8 @@ if download or not use_activity:\n
if use_activity:\n
if use_activity:\n
uid_list = context.getDestinationUidList()\n
uid_list = context.getDestinationUidList()\n
method_kw = dict(event_relative_url=context.getRelativeUrl(),\n
method_kw = dict(event_relative_url=context.getRelativeUrl(),\n
from_url=from_url)\n
from_url=from_url,\n
attachment_list=attachment_list)\n
portal.portal_catalog.searchAndActivate(method_id="Entity_sendEmail",\n
portal.portal_catalog.searchAndActivate(method_id="Entity_sendEmail",\n
uid=uid_list,\n
uid=uid_list,\n
method_kw=method_kw, **kw)\n
method_kw=method_kw, **kw)\n
...
...
bt5/erp5_base/bt/revision
View file @
18916db7
1023
1024
\ No newline at end of file
\ No newline at end of file
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