diff options
| author | Martin Trigaux <mat@odoo.com> | 2015-12-01 08:41:52 +0100 |
|---|---|---|
| committer | Martin Trigaux <mat@odoo.com> | 2015-12-01 08:41:52 +0100 |
| commit | a9ec2894ded44e405a9adfe8a8c021a7dcc27c20 (patch) | |
| tree | 56f82900a68aa55a84c8f4819082272498910f1a /addons/website/controllers/main.py | |
| parent | 0ee11f23f15ab11851baf3ca00d9c3a5947fe294 (diff) | |
| parent | 19fe77b7d71aed1b25bc3f15538eea0a5510020b (diff) | |
[MERGE] forward port of branch saas-6 up to 19fe77b
Diffstat (limited to 'addons/website/controllers/main.py')
| -rw-r--r-- | addons/website/controllers/main.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py index c274a14ac8d..182d05c3c51 100644 --- a/addons/website/controllers/main.py +++ b/addons/website/controllers/main.py @@ -38,9 +38,9 @@ class Website(openerp.addons.web.controllers.main.Home): else: first_menu = main_menu.child_id and main_menu.child_id[0] if first_menu: - if not (first_menu.url.startswith(('/page/', '/?', '/#')) or (first_menu.url=='/')): + if first_menu.url and (not (first_menu.url.startswith(('/page/', '/?', '/#')) or (first_menu.url == '/'))): return request.redirect(first_menu.url) - if first_menu.url.startswith('/page/'): + if first_menu.url and first_menu.url.startswith('/page/'): return request.registry['ir.http'].reroute(first_menu.url) return self.page(page) |