Add format methods from Report to email rendering context

issue9785
review328761002
This commit is contained in:
Cédric Krier committed 2020-12-16 21:34:06 +01:00
1 parent a7539e2012
commit 033f22e197
2 files changed
+16 -2

No files matched your search

+2
View File
@@ -1,3 +1,5 @@
* Add format methods from Report to email rendering context
Version 5.8.0 - 2020-11-02
* Bug fixes (see mercurial logs for details)
* Remove support for Python 3.5
+14 -2
View File
@@ -589,12 +589,13 @@ class Activity(ModelSQL, ModelView):
yield END, QName('img'), pos
yield kind, data, pos
context = self.email_context(record)
title = (TextTemplate(translated.email_title)
.generate(record=record.record)
.generate(**context)
.render())
template = MarkupTemplate(translated.email_template)
content = (template
.generate(record=record.record)
.generate(**context)
.filter(convert_href)
.render())
@@ -617,6 +618,17 @@ class Activity(ModelSQL, ModelView):
sendmail_transactional(
self.email_from, to_addrs, msg, datamanager=smtpd_datamanager)
def email_context(self, record):
return {
'record': record.record,
'format_date': Report.format_date,
'format_datetime': Report.format_datetime,
'format_timedelta': Report.format_timedelta,
'format_currency': Report.format_currency,
'format_number': Report.format_number,
'datetime': datetime,
}
class Record(ModelSQL, ModelView):
"Marketing Record"