summaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
authorDenis Ledoux <dle@odoo.com>2016-01-15 16:34:42 +0100
committerDenis Ledoux <dle@odoo.com>2016-01-15 16:37:30 +0100
commitddd3e08fbcb54e971537f9f20668c00dbe36ab37 (patch)
treef856ba2c3404ac5cccd7dc719e37226a68990cd8 /addons
parent59ce9a0ed94cd82679dfae8a0dd69f05dbca1e34 (diff)
[FIX] im_livecat: `HttpRequest.render` returns a Response
This revision is related to 100d604cb0ebd6aa3f57c9809c6771b0b4b72a07 The above revision aimed to add the correct `content-type` headers, the according route returning Javascript and not simple html. HttpRequest.render` returns a Response, and `make_response` doesn't expect a Response as first argument. In other words, this is not possible to make Reponse from a Response. `HttpRequest.render` accepts kwargs, including `headers`. opw-666898
Diffstat (limited to 'addons')
-rw-r--r--addons/im_livechat/controllers/main.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/addons/im_livechat/controllers/main.py b/addons/im_livechat/controllers/main.py
index 30ae212c8b2..eaf54eaf399 100644
--- a/addons/im_livechat/controllers/main.py
+++ b/addons/im_livechat/controllers/main.py
@@ -30,8 +30,7 @@ class LivechatController(http.Controller):
username = kwargs.get("username", _("Visitor"))
channel = request.env['im_livechat.channel'].sudo().browse(channel_id)
info = request.env['im_livechat.channel'].get_livechat_info(channel.id, username=username)
- js = request.render('im_livechat.loader', {'info': info, 'web_session_required': True})
- return request.make_response(js, headers=[('Content-Type', 'application/javascript')])
+ return request.render('im_livechat.loader', {'info': info, 'web_session_required': True}, headers=[('Content-Type', 'application/javascript')])
@http.route('/im_livechat/init', type='json', auth="public")
def livechat_init(self, channel_id):