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
alecs_myu
erp5
Commits
44168884
Commit
44168884
authored
Nov 05, 2012
by
Kazuhiko Shiozaki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
preserve notification_message's category and language only if notification_message is found.
this commit fixes a regression in
ecb09a0d
.
parent
324a334b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
4 deletions
+5
-4
product/ERP5/Tool/PasswordTool.py
product/ERP5/Tool/PasswordTool.py
+5
-4
No files found.
product/ERP5/Tool/PasswordTool.py
View file @
44168884
...
...
@@ -191,17 +191,18 @@ class PasswordTool(BaseTool):
"Thank you"
,
mapping
=
message_dict
)
message
=
message
.
translate
()
event_keyword_argument_dict
=
{}
else
:
subject
=
notification_message
.
getTitle
()
if
notification_message
.
getContentType
()
==
"text/html"
:
message
=
notification_message
.
asEntireHTML
(
substitution_method_parameter_dict
=
message_dict
)
else
:
message
=
notification_message
.
asText
(
substitution_method_parameter_dict
=
message_dict
)
event_keyword_argument_dict
=
{
'resource'
:
notification_message
.
getSpecialise
(),
'language'
:
notification_message
.
getLanguage
(),
}
event_keyword_argument_dict
=
{
'resource'
:
notification_message
.
getSpecialise
(),
'language'
:
notification_message
.
getLanguage
(),
}
self
.
getPortalObject
().
portal_notifications
.
sendMessage
(
sender
=
sender
,
recipient
=
[
user
,],
subject
=
subject
,
message
=
message
,
store_as_event
=
store_as_event
,
...
...
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