summaryrefslogtreecommitdiff
path: root/addons/website_version
diff options
context:
space:
mode:
authorJérome Maes <jem@openerp.com>2015-02-12 10:05:28 +0100
committerJérome Maes <jem@openerp.com>2015-02-13 09:19:24 +0100
commit5c07f3ed47f3cbb2bc9e521af07e33c08ae8cb52 (patch)
tree9cfbdad67ea56f2c543228ff331e0ddc3bbc7b33 /addons/website_version
parent69746e4a53334420d417a3d70b4b8ac04799fd8b (diff)
[FIX] website_version : call parent instead of duplicate of parent code.
Diffstat (limited to 'addons/website_version')
-rw-r--r--addons/website_version/models/ir_qweb.py17
1 files changed, 1 insertions, 16 deletions
diff --git a/addons/website_version/models/ir_qweb.py b/addons/website_version/models/ir_qweb.py
index 6d71e188fde..aebfecbf4d3 100644
--- a/addons/website_version/models/ir_qweb.py
+++ b/addons/website_version/models/ir_qweb.py
@@ -6,8 +6,6 @@ as well as render a few fields differently.
Also, adds methods to convert values back to openerp models.
"""
-
-from openerp.addons.base.ir.ir_qweb import QWebContext
from openerp import models
@@ -17,11 +15,6 @@ class QWeb(models.AbstractModel):
_inherit = 'website.qweb'
def render(self, cr, uid, id_or_xml_id, qwebcontext=None, loader=None, context=None):
- if qwebcontext is None:
- qwebcontext = {}
-
- if not isinstance(qwebcontext, QWebContext):
- qwebcontext = QWebContext(cr, uid, qwebcontext, loader=loader, context=context)
if context is None:
context = {}
website_id = context.get('website_id')
@@ -46,12 +39,4 @@ class QWeb(models.AbstractModel):
id_or_xml_id = self.pool["ir.ui.view"].search(cr, uid, [('key', '=', id_or_xml_id), ('version_id', '=', False), '|', ('website_id', '=', website_id), ('website_id', '=', False)], order='website_id', limit=1, context=context)[0]
else:
id_or_xml_id = self.pool["ir.ui.view"].search(cr, uid, [('key', '=', id_or_xml_id), '|', ('website_id', '=', website_id), ('website_id', '=', False), ('version_id', '=', False)], order='website_id', limit=1, context=context)[0]
-
- qwebcontext['__template__'] = id_or_xml_id
- stack = qwebcontext.get('__stack__', [])
- if stack:
- qwebcontext['__caller__'] = stack[-1]
- stack.append(id_or_xml_id)
- qwebcontext['__stack__'] = stack
- qwebcontext['xmlid'] = str(stack[0])
- return self.render_node(self.get_template(id_or_xml_id, qwebcontext), qwebcontext)
+ return super(QWeb, self).render(cr, uid, id_or_xml_id, qwebcontext, loader=loader, context=context)