Browse Source

[FIX] email_template_qweb: The decoding cannot be done after render_post_process call

pull/117/head
Pedro M. Baeza 8 years ago
parent
commit
09f821931a
  1. 9
      email_template_qweb/models/mail_template.py

9
email_template_qweb/models/mail_template.py

@ -27,17 +27,16 @@ class MailTemplate(models.Model):
if this.body_type == 'qweb' and\ if this.body_type == 'qweb' and\
(not fields or 'body_html' in fields): (not fields or 'body_html' in fields):
for record in self.env[this.model].browse(record_id): for record in self.env[this.model].browse(record_id):
result[record_id]['body_html'] = self.render_post_process(
this.body_view_id.render({
body_html = this.body_view_id.render({
'object': record, 'object': record,
'email_template': this, 'email_template': this,
}) })
)
# Some wizards, like when sending a sales order, need this # Some wizards, like when sending a sales order, need this
# fix to display accents correctly # fix to display accents correctly
if isinstance(result[record_id]['body_html'], unicode): if isinstance(result[record_id]['body_html'], unicode):
result[record_id]['body_html'] = (
result[record_id]['body_html'].decode('utf-8')
body_html = body_html.decode('utf-8')
result[record_id]['body_html'] = self.render_post_process(
body_html
) )
result[record_id]['body'] = tools.html_sanitize( result[record_id]['body'] = tools.html_sanitize(
result[record_id]['body_html'] result[record_id]['body_html']

Loading…
Cancel
Save