pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] mail: improved render_template context preparation

Browse Source 
- rename '_pre_render_template' to '_prepare_render_template_context'
  - _preare_render_template_context return a new context, which is distinct
    from original method context - as we want to control more precisely what
    context will be available to render_template().

bzr revid: xal@openerp.com-20120820081911-34h2zlzcrspfpyz6
This commit is contained in:
Xavier ALT
2012-08-20 10:19:11 +02:00
parent e0aa37e09d
commit 9f7d2c697a
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/mail/wizard/mail_compose_message.py
+10 -10
View File
@@ -216,14 +216,14 @@ class mail_compose_message(osv.osv_memory):
active_ids = active_model_pool.search(cr, uid, ast.literal_eval(mail.filter_id.domain), context=ast.literal_eval(mail.filter_id.context))
for active_id in active_ids:
self._pre_render_template(cr, uid, active_model, active_id, context)
subject = self.render_template(cr, uid, mail.subject, active_model, active_id, context)
rendered_body = self.render_template(cr, uid, body, active_model, active_id, context)
email_from = self.render_template(cr, uid, mail.email_from, active_model, active_id, context)
email_to = self.render_template(cr, uid, mail.email_to, active_model, active_id, context)
email_cc = self.render_template(cr, uid, mail.email_cc, active_model, active_id, context)
email_bcc = self.render_template(cr, uid, mail.email_bcc, active_model, active_id, context)
reply_to = self.render_template(cr, uid, mail.reply_to, active_model, active_id, context)
render_context = self._prepare_render_template_context(cr, uid, active_model, active_id, context)
subject = self.render_template(cr, uid, mail.subject, active_model, active_id, render_context)
rendered_body = self.render_template(cr, uid, body, active_model, active_id, render_context)
email_from = self.render_template(cr, uid, mail.email_from, active_model, active_id, render_context)
email_to = self.render_template(cr, uid, mail.email_to, active_model, active_id, render_context)
email_cc = self.render_template(cr, uid, mail.email_cc, active_model, active_id, render_context)
email_bcc = self.render_template(cr, uid, mail.email_bcc, active_model, active_id, render_context)
reply_to = self.render_template(cr, uid, mail.reply_to, active_model, active_id, render_context)
# in mass-mailing mode we only schedule the mail for sending, it will be
# processed as soon as the mail scheduler runs.
@@ -242,8 +242,8 @@ class mail_compose_message(osv.osv_memory):
return {'type': 'ir.actions.act_window_close'}
def _pre_render_template(self, cr, uid, active_model, active_id, context):
return True
def _prepare_render_template_context(self, cr, uid, active_model, active_id, context):
return {}
def render_template(self, cr, uid, template, model, res_id, context=None):
"""Render the given template text, replace mako-like expressions ``${expr}``