From cf58fd485b848bba138a202aa50d7e5247b819a4 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 31 Oct 2013 18:34:28 +0100 Subject: [PATCH] [IMP] first menu becomes root url bzr revid: fme@openerp.com-20131031173428-c6l8b19ig5npwb9i --- addons/website/controllers/main.py | 14 +++++++++++++- addons/website/static/src/css/editor.css | 3 +++ addons/website/static/src/css/editor.sass | 2 ++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py index 2548ad80824..3167a63b0cc 100644 --- a/addons/website/controllers/main.py +++ b/addons/website/controllers/main.py @@ -49,7 +49,19 @@ MAX_IMAGE_WIDTH, MAX_IMAGE_HEIGHT = IMAGE_LIMITS = (1024, 768) class Website(openerp.addons.web.controllers.main.Home): @website.route('/', type='http', auth="public", multilang=True) def index(self, **kw): - return self.page("website.homepage") + # TODO: check if plain SQL is needed + menu = request.registry['website.menu'] + root_domain = [('parent_id', '=', False)] # TODO: multiwebsite ('website_id', '=', request.website.id), + root_id = menu.search(request.cr, request.uid, root_domain, limit=1, context=request.context)[0] + first_menu = menu.search_read( + request.cr, request.uid, [('parent_id', '=', root_id)], ['url'], + limit=1, order='sequence', context=request.context) + if first_menu: + first_menu = first_menu[0]['url'] + if first_menu and first_menu != '/': + return request.redirect(first_menu) + else: + return self.page("website.homepage") @website.route('/pagenew/', type='http', auth="user") def pagenew(self, path, noredirect=NOPE): diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css index 0a8e18fa727..ebf481265db 100644 --- a/addons/website/static/src/css/editor.css +++ b/addons/website/static/src/css/editor.css @@ -147,6 +147,9 @@ div.oe_menu_buttons { right: -8px; } +ul.oe_menu_editor > li:first-child > div > i:before { + content: "\f015"; +} ul.oe_menu_editor, ul.oe_menu_editor ul { list-style-type: none; margin: 0; diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass index 052e473d484..9f6a1b15170 100644 --- a/addons/website/static/src/css/editor.sass +++ b/addons/website/static/src/css/editor.sass @@ -129,6 +129,8 @@ div.oe_menu_buttons top: -8px right: -8px ul.oe_menu_editor + > li:first-child > div > i:before + content: "\f015" &, & ul list-style-type: none margin: 0