[IMP] Honor db query param in /web/login too
bzr revid: fme@openerp.com-20140117140746-v86qxs3msxd0u6mu
This commit is contained in:
parent
fdfcf1b71f
commit
bb3118ac3d
|
@ -617,9 +617,16 @@ class Home(http.Controller):
|
||||||
return local_redirect('/web/login', query=request.params)
|
return local_redirect('/web/login', query=request.params)
|
||||||
|
|
||||||
@http.route('/web/login', type='http', auth="none")
|
@http.route('/web/login', type='http', auth="none")
|
||||||
def web_login(self, redirect=None, **kw):
|
def web_login(self, redirect=None, db=None, **kw):
|
||||||
if request.session.db is None:
|
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')
|
return local_redirect('/web/database/selector')
|
||||||
|
|
||||||
values = request.params.copy()
|
values = request.params.copy()
|
||||||
if not redirect:
|
if not redirect:
|
||||||
redirect = '/web?' + request.httprequest.query_string
|
redirect = '/web?' + request.httprequest.query_string
|
||||||
|
|
Loading…
Reference in New Issue