summaryrefslogtreecommitdiff
path: root/addons/website/controllers/main.py
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2019-06-18 10:24:25 +0200
committerChristophe Simonis <chs@odoo.com>2019-06-18 10:24:25 +0200
commit9035fb8a2a4ddfae2951ed1f540060896924bb44 (patch)
tree024ce185effd5b1cb59463d2a187a9fa4db35472 /addons/website/controllers/main.py
parent0fc33c37c3cea3cadf69c2352f49c88b295bd63f (diff)
parent618ea1ab675d6454280deac7d6f853b2556e5be1 (diff)
[MERGE] forward port branch saas-12.4 up to 618ea1ab675
Diffstat (limited to 'addons/website/controllers/main.py')
-rw-r--r--addons/website/controllers/main.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index 03a6b74877f..57a4e65dec3 100644
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -99,7 +99,7 @@ class Website(Home):
if request.env['res.users'].browse(request.uid).has_group('base.group_user'):
redirect = b'/web?' + request.httprequest.query_string
else:
- redirect = '/'
+ redirect = '/my'
return http.redirect_with_hash(redirect)
return response
@@ -471,3 +471,8 @@ class WebsiteBinary(http.Controller):
if unique:
kw['unique'] = unique
return Binary().content_image(**kw)
+
+ @http.route(['/favicon.ico'], type='http', auth='public', website=True)
+ def favicon(self, **kw):
+ # when opening a pdf in chrome, chrome tries to open the default favicon url
+ return self.content_image(model='website', id=str(request.website.id), field='favicon', **kw)