odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] forward port of branch saas-5 up to revid c19bb8c

This commit is contained in:
Christophe Simonis 2014-06-01 14:35:54 +02:00
parent bef99e2b16 c19bb8ce48
commit ea69325466
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/website/controllers/main.py
View File

@ -32,14 +32,16 @@ class Website(openerp.addons.web.controllers.main.Home):
page = 'homepage'
try:
main_menu = request.registry['ir.model.data'].get_object(request.cr, request.uid, 'website', 'main_menu')
except Exception:
pass
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=='/')):
return request.redirect(first_menu.url)
if first_menu.url.startswith('/page/'):
page = first_menu[6:]
except:
pass
page = first_menu.url[6:]
return self.page(page)
@http.route(website=True, auth="public")