Techsystech
/
web
mirror of https://github.com/OCA/web.git
3
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

[11.0][MIG] Standard Migration

pull/2770/head
Marçal Isern 2017-11-14 16:51:57 +01:00 committed by Daryl Chen
parent bc4febfcde
commit 6fc328074b
5 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
web_favicon/README.rst
View File

@ -68,6 +68,7 @@ Contributors
* Holger Brunn <hbrunn@therp.nl>
* Pedro M. Baeza <pedro.baeza@gmail.com>
* Dennis Sluijk <d.sluijk@onestein.nl>
* Marçal Isern <marsal.isern@qubiq.es>
Maintainer
----------

6
web_favicon/__manifest__.py
View File

@ -1,11 +1,11 @@
# -*- coding: utf-8 -*-
# © 2015 Therp BV <http://therp.nl>
# © 2016 Pedro M. Baeza
# Copyright 2015 Therp BV <http://therp.nl>
# Copyright 2016 Pedro M. Baeza
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
{
"name": "Custom shortcut icon",
"version": "10.0.1.0.0",
"version": "11.0.1.0.0",
"author": "Therp BV, "
"Tecnativa, "
"Odoo Community Association (OCA)",

9
web_favicon/controllers/web_favicon.py
View File

@ -1,8 +1,9 @@
# -*- coding: utf-8 -*-
# © 2015 Therp BV <http://therp.nl>
# Copyright 2015 Therp BV <http://therp.nl>
# Copyright 2017 QubiQ 2010 <http://www.qubiq.es>
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
import StringIO
from io import BytesIO
import base64
from odoo import http
from odoo.tools.misc import file_open
@ -21,9 +22,9 @@ class WebFavicon(http.Controller):
favicon = company.favicon_backend
favicon_mimetype = company.favicon_backend_mimetype
if not favicon:
favicon = file_open('web/static/src/img/favicon.ico')
favicon = file_open('web/static/src/img/favicon.ico', 'rb')
favicon_mimetype = 'image/x-icon'
else:
favicon = StringIO.StringIO(base64.b64decode(favicon))
favicon = BytesIO(base64.b64decode(favicon))
return request.make_response(
favicon.read(), [('Content-Type', favicon_mimetype)])

4
web_favicon/models/res_company.py
View File

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
# © 2015 Therp BV <http://therp.nl>
# © 2016 Pedro M. Baeza
# Copyright 2015 Therp BV <http://therp.nl>
# Copyright 2016 Pedro M. Baeza
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
from odoo import models, fields

2
web_favicon/tests/test_web_favicon.py
View File

@ -39,7 +39,7 @@ class TestWebFavicon(TransactionCase):
# our own icon
company.write({
'favicon_backend': base64.b64encode(file_open(
'web_favicon/static/description/icon.png').read()),
'web_favicon/static/description/icon.png', 'rb').read()),
'favicon_backend_mimetype': 'image/png',
})
data = WebFavicon().icon()