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

[IMP] Honor db query param in /web/login too 

bzr revid: fme@openerp.com-20140117140746-v86qxs3msxd0u6mu
This commit is contained in:
Fabien Meghazi 2014-01-17 15:07:46 +01:00
parent fdfcf1b71f
commit bb3118ac3d
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
addons/web/controllers/main.py
View File

@ -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