From 5a70bc038a2fa5aeb14ac3b3d95c4e619fa4e058 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Wed, 2 Oct 2013 16:37:40 +0200 Subject: [PATCH] Changed base url bzr revid: nicolas.vanhoren@openerp.com-20131002143740-jr8xz6j4qgs97ztp --- addons/web/controllers/main.py | 6 ++++++ addons/web/static/src/js/chrome.js | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index bcef905b3c4..057b005122b 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -527,6 +527,12 @@ class Home(http.Controller): @http.route('/', type='http', auth="none") def index(self, s_action=None, db=None, debug=False, **kw): + query = dict(urlparse.parse_qsl(request.httprequest.query_string, keep_blank_values=True)) + redirect = '/web' + '?' + urllib.urlencode(query) + return redirect_with_hash(redirect) + + @http.route('/web', type='http', auth="none") + def web_client(self, s_action=None, db=None, debug=False, **kw): debug = debug != False lst = http.db_list(True) diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 11a2e58ae5b..09694bb0c38 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -534,7 +534,7 @@ instance.web.DatabaseManager = instance.web.Widget.extend({ 'login': 'admin', 'password': form_obj['create_admin_pwd'], 'login_successful': function() { - var url = '/?db=' + form_obj['db_name']; + var url = '/web?db=' + form_obj['db_name']; if (self.session.debug) { url += '&debug'; }