diff options
| author | Jérome Maes <jem@openerp.com> | 2015-10-01 13:53:55 +0200 |
|---|---|---|
| committer | Jérome Maes <jem@openerp.com> | 2015-10-06 09:43:02 +0200 |
| commit | a4b17c262107091ede3c59e8c9cfa0b9f544a593 (patch) | |
| tree | 6a4a1adeaf985b61770e64da1ae8097b8895ab62 /addons | |
| parent | 11e429cb7a42a351669b58f941b9ed4dc010b512 (diff) | |
[FIX] im_livechat : assets controller, mock_attachment includes id now.
I miss commit c3c2281a4d6a148cebf4eed2d6ab894eedbf472c, so the search on attachment url is useless now.
Also check if the return content is not None, avoiding to decode base64 a None object.
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/im_livechat/controllers/main.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/addons/im_livechat/controllers/main.py b/addons/im_livechat/controllers/main.py index 4ee0382bfdf..2fe7b2070ae 100644 --- a/addons/im_livechat/controllers/main.py +++ b/addons/im_livechat/controllers/main.py @@ -14,10 +14,9 @@ class LivechatController(http.Controller): mock_attachment = getattr(asset, ext)() if isinstance(mock_attachment, list): # suppose that CSS asset will not required to be split in pages mock_attachment = mock_attachment[0] - attachment = request.env['ir.attachment'].search([('name', '=', mock_attachment.url)]) # can't use /web/content directly because we don't have attachment ids (attachments must be created) - status, headers, content = binary_content(id=attachment.id, unique=asset.checksum) - content_base64 = base64.b64decode(content) + status, headers, content = binary_content(id=mock_attachment.id, unique=asset.checksum) + content_base64 = base64.b64decode(content) if content else '' headers.append(('Content-Length', len(content_base64))) return request.make_response(content_base64, headers) |