Commit 408ed97c authored by Rafael Monnerat's avatar Rafael Monnerat

Use email_from_name when send the email.



git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@26404 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent d2ddbb95
...@@ -317,11 +317,13 @@ class Message: ...@@ -317,11 +317,13 @@ class Message:
user_email = portal.getProperty('email_to_address', user_email = portal.getProperty('email_to_address',
portal.getProperty('email_from_address')) portal.getProperty('email_from_address'))
email_from_name = portal.getProperty('email_from_name',
portal.getProperty('email_from_address'))
call_traceback = '' call_traceback = ''
if self.call_traceback: if self.call_traceback:
call_traceback = 'Created at:\n%s' % self.call_traceback call_traceback = 'Created at:\n%s' % self.call_traceback
mail_text = """From: %s mail_text = """From: %s <%s>
To: %s To: %s
Subject: %s Subject: %s
...@@ -338,7 +340,8 @@ Named Parameters: %r ...@@ -338,7 +340,8 @@ Named Parameters: %r
Exception: %s %s Exception: %s %s
%s %s
""" % (activity_tool.email_from_address, user_email, message, message, """ % (email_from_name, activity_tool.email_from_address,
user_email, message, message,
activity_tool.getCurrentNode(), self.user_name, activity_tool.getCurrentNode(), self.user_name,
'/'.join(self.object_path), self.method_id, self.args, self.kw, '/'.join(self.object_path), self.method_id, self.args, self.kw,
call_traceback, self.exc_type, self.exc_value, self.traceback) call_traceback, self.exc_type, self.exc_value, self.traceback)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment