From 39f0f5db77f793c7fb996d53195524de0e035de4 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@odoo.com>
Date: Wed, 27 Jun 2018 09:50:01 +0200
Subject: [PATCH] [FIX] ir_qweb: send template options in context to the fields

Application of a fix more specific to the problem of the contact widget
which can not serialize the dictionary because it contains the values of
the context of which browse record. (because contact try to
json.dumps options for multi-edition feature in web_editor)

opw-1859848

https://github.com/odoo/odoo/commit/ab85e9594651fd33ffd2747f4d3c5b360e7c7922
---
 addons/web/models/ir_qweb.py           |  2 +-
 addons/web_editor/models/ir_qweb.py    |  1 +
 odoo/addons/base/ir/ir_qweb/fields.py  |  4 ++--
 odoo/addons/base/ir/ir_qweb/ir_qweb.py | 22 +++++-----------------
 4 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/addons/web/models/ir_qweb.py b/addons/web/models/ir_qweb.py
index 0a5e0deb4e9..972ae4d813d 100644
--- a/addons/web/models/ir_qweb.py
+++ b/addons/web/models/ir_qweb.py
@@ -65,7 +65,7 @@ class Image(models.AbstractModel):
         atts["data-zoom"] = src_zoom and u'1' or None
         atts["data-zoom-image"] = src_zoom
 
-        atts = self.env['ir.qweb']._post_processing_att('img', atts, options)
+        atts = self.env['ir.qweb']._post_processing_att('img', atts, options.get('template_options'))
 
         img = ['<img']
         for name, value in atts.items():
diff --git a/addons/web_editor/models/ir_qweb.py b/addons/web_editor/models/ir_qweb.py
index 4a41ff572bb..6802091d4c4 100644
--- a/addons/web_editor/models/ir_qweb.py
+++ b/addons/web_editor/models/ir_qweb.py
@@ -173,6 +173,7 @@ class Contact(models.AbstractModel):
     @api.model
     def attributes(self, record, field_name, options, values):
         attrs = super(Contact, self).attributes(record, field_name, options, values)
+        options.pop('template_options') # remove options not specific to this widget
         attrs['data-oe-contact-options'] = json.dumps(options)
         return attrs
 
diff --git a/odoo/addons/base/ir/ir_qweb/fields.py b/odoo/addons/base/ir/ir_qweb/fields.py
index 1f4475824bc..19e15ff4621 100644
--- a/odoo/addons/base/ir/ir_qweb/fields.py
+++ b/odoo/addons/base/ir/ir_qweb/fields.py
@@ -261,7 +261,7 @@ class HTMLConverter(models.AbstractModel):
         for element in body.iter():
             if element.attrib:
                 attrib = OrderedDict(element.attrib)
-                attrib = irQweb._post_processing_att(element.tag, attrib, options)
+                attrib = irQweb._post_processing_att(element.tag, attrib, options.get('template_options'))
                 element.attrib.clear()
                 element.attrib.update(attrib)
         return etree.tostring(body, encoding='unicode', method='html')[6:-7]
@@ -488,7 +488,7 @@ class Contact(models.AbstractModel):
             'object': value,
             'options': options
         }
-        return self.env['ir.qweb'].render('base.contact', val)
+        return self.env['ir.qweb'].render('base.contact', val, **options.get('template_options'))
 
 
 class QwebView(models.AbstractModel):
diff --git a/odoo/addons/base/ir/ir_qweb/ir_qweb.py b/odoo/addons/base/ir/ir_qweb/ir_qweb.py
index 105c12f7b08..1c2f07185ae 100644
--- a/odoo/addons/base/ir/ir_qweb/ir_qweb.py
+++ b/odoo/addons/base/ir/ir_qweb/ir_qweb.py
@@ -51,21 +51,7 @@ class IrQWeb(models.AbstractModel, QWeb):
             if method.startswith('render_'):
                 _logger.warning("Unused method '%s' is found in ir.qweb." % method)
 
-        def jsonable(val):
-            try:
-                json.dumps(val)
-                return True
-            except Exception:
-                return False
-
-        context = {
-            key: val
-            for key, val in self.env.context.items()
-            if isinstance(key, pycompat.string_types) and not key.startswith('_')
-            if jsonable(val)
-        }
-        context['dev_mode'] = 'qweb' in tools.config['dev_mode']
-        # context = dict(self.env.context, dev_mode='qweb' in tools.config['dev_mode'])
+        context = dict(self.env.context, dev_mode='qweb' in tools.config['dev_mode'])
         context.update(options)
 
         return super(IrQWeb, self).render(id_or_xml_id, values=values, **context)
@@ -369,8 +355,7 @@ class IrQWeb(models.AbstractModel, QWeb):
         field = record._fields[field_name]
 
         # adds template compile options for rendering fields
-        for k, v in options.items():
-            field_options.setdefault(k, v)
+        field_options['template_options'] = options
 
         # adds generic field options
         field_options['tagName'] = tagName
@@ -392,6 +377,9 @@ class IrQWeb(models.AbstractModel, QWeb):
         return (attributes, content, inherit_branding or translate)
 
     def _get_widget(self, value, expression, tagName, field_options, options, values):
+        # adds template compile options for rendering fields
+        field_options['template_options'] = options
+
         field_options['type'] = field_options['widget']
         field_options['tagName'] = tagName
         field_options['expression'] = expression