summaryrefslogtreecommitdiff
path: root/addons/website/controllers
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2019-06-14 15:20:01 +0200
committerChristophe Simonis <chs@odoo.com>2019-06-14 15:20:01 +0200
commit34a8754d4f0a6dca7cf612859d5702bcae1f90d6 (patch)
tree757fd2bd012ff92968ea0cc0f27523fd0a1587cf /addons/website/controllers
parent856685d6408857678ca9fc25b09dfea468800f93 (diff)
parent498b4b4350d5fdeab0fb58275ad3b8e4dd443190 (diff)
[MERGE] forward port branch saas-12.2 up to 498b4b4350d
Diffstat (limited to 'addons/website/controllers')
-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 d322366f359..5e7e39f9dfc 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
@@ -467,3 +467,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)