From bb3118ac3d7c2f6ceb495cb168fe0e6f04b29353 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Fri, 17 Jan 2014 15:07:46 +0100 Subject: [PATCH] [IMP] Honor db query param in /web/login too bzr revid: fme@openerp.com-20140117140746-v86qxs3msxd0u6mu --- addons/web/controllers/main.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index c3d20a4a3fd..1bff1178f45 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -617,9 +617,16 @@ class Home(http.Controller): return local_redirect('/web/login', query=request.params) @http.route('/web/login', type='http', auth="none") - def web_login(self, redirect=None, **kw): - if request.session.db is None: + def web_login(self, redirect=None, db=None, **kw): + if db and db != request.session.db: + request.session.logout() + request.session.db = db + request.params.pop('db', None) + return local_redirect('/web/login', query=request.params) + + if not request.session.db and not db: return local_redirect('/web/database/selector') + values = request.params.copy() if not redirect: redirect = '/web?' + request.httprequest.query_string