From 70a69bf9bc7e35200f0892e421e81ad643ab915a Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Tue, 5 Jul 2016 15:29:31 +0200 Subject: [PATCH] [FIX] website/im_livechat: use new api to get asset Issue: can't get asset content, self don't have env attribute, wrong attributes send. --- addons/im_livechat/controllers/main.py | 2 +- addons/website/controllers/main.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/addons/im_livechat/controllers/main.py b/addons/im_livechat/controllers/main.py index d2183ef2afa..c80630deff3 100644 --- a/addons/im_livechat/controllers/main.py +++ b/addons/im_livechat/controllers/main.py @@ -12,7 +12,7 @@ class LivechatController(http.Controller): def livechat_lib(self, ext, **kwargs): # _get_asset return the bundle html code (script and link list) but we want to use the attachment content xmlid = 'im_livechat.external_lib' - files, remains = request.registry["ir.qweb"]._get_asset_content(request.cr, request.uid, xmlid, request.context) + files, remains = request.env["ir.qweb"]._get_asset_content(xmlid, options=request.context) asset = AssetsBundle(xmlid, files, remains) mock_attachment = getattr(asset, ext)() diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py index fe1439f7dfa..0b1d9bd78af 100644 --- a/addons/website/controllers/main.py +++ b/addons/website/controllers/main.py @@ -344,7 +344,6 @@ class Website(openerp.addons.web.controllers.main.Home): """ cr, uid, context, pool = request.cr, request.uid, request.context, request.registry view = pool["ir.ui.view"] - qweb = pool["ir.qweb"] context = dict(request.context or {}, active_test=True) @@ -356,7 +355,7 @@ class Website(openerp.addons.web.controllers.main.Home): set_active(enable, True) if get_bundle: - return qweb._get_asset(cr, uid, 'web.assets_frontend', context) + return request.env["ir.qweb"]._get_asset('web.assets_frontend', options=context) return True