Merge pull request #166 from gisce/61462_imp_allow_env_variables_prev…

…iew_templates

Allow env variables in template preview

migrations/5.0.24.9.0/post-0002_update_preview_email_view.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+from oopgrade.oopgrade import load_data_records
+
+
+def up(cursor, installed_version):
+    if not installed_version:
+        return
+
+    load_data_records(cursor, 'poweremail', 'wizard/wizard_poweremail_preview.xml', ['poweremail_preview_form'])
+
+
+def down(cursor, installed_version):
+    pass
+
+
+migrate = up

poweremail_template.py

@@ -186,7 +186,9 @@ def get_value(cursor, user, recid, message=None, template=None, context=None):
                 context = {}
             ctx = context.copy()
             ctx['browse_reference'] = True
-            ctx['lang'] = context.get('lang', get_email_default_lang())
+            ctx['lang'] = context.get('lang', False)
+            if not ctx['lang']:
+                ctx['lang'] = get_email_default_lang()
             object = pool.get(template.object_name.model).simple_browse(cursor, user, recid, context=ctx)
             env = context.copy()
             env.update({

wizard/wizard_poweremail_preview.py

@@ -54,6 +54,7 @@ def get_save_to_draft(self, cursor, uid, context=None):
         'body_text': fields.text('Body', readonly=True),
         'body_html': fields.text('Body', readonly=True),
         'report': fields.char('Report Name', size=100, readonly=True),
+        'env': fields.text('Extra scope variables'),
         'state': fields.selection([('init', 'Init'), ('end', 'End'), ('error', 'Error')], 'State'),
         'save_to_drafts_prev': fields.boolean('Save to Drafts',
                                          help="When automatically sending emails generated from"
@@ -67,15 +68,16 @@ def get_save_to_draft(self, cursor, uid, context=None):
     }
 
     def action_generate_static_mail(self, cr, uid, ids, context=None):
-        wizard_values = self.read(cr, uid, ids, ['model_ref'], context=context)
+        wizard_values = self.read(cr, uid, ids, ['model_ref', 'env'], context=context)
 
         if context is None:
             context = {}
         if not wizard_values:
             return {}
 
         vals = {}
-        model_name, record_id = wizard_values[0]['model_ref'].split(',')
+        wizard_values = wizard_values[0]
+        model_name, record_id = wizard_values['model_ref'].split(',')
         record_id = int(record_id)
         template = self.pool.get('poweremail.templates').browse(cr, uid, context['active_id'], context=context)
         # Search translated template
@@ -87,7 +89,9 @@ def action_generate_static_mail(self, cr, uid, ids, context=None):
             template = self.pool.get('poweremail.templates').browse(cr, uid, context['active_id'], ctx)
 
         mail_fields = ['to', 'cc', 'bcc', 'subject', 'body_text', 'body_html', 'report']
-        ctx.update({'raise_exception': True})
+        ctx['raise_exception'] = True
+        if wizard_values['env']:
+            ctx.update(eval(wizard_values['env']))
         for field in mail_fields:
             try:
                 if field == 'report':

wizard/wizard_poweremail_preview.xml

@@ -14,6 +14,7 @@
                     <field name="cc" colspan="2"/>
                     <field name="bcc" colspan="2"/>
                     <field name="subject" colspan="4"/>
+                    <field name="env" colspan="4" widget="codeeditor" widget_props="{'lang': 'json'}" height="100"/>
                     <notebook>
                         <page string="Body preview">
                             <field name="body_text" colspan="4" widget="html_preview" nolabel="1"/>