diff options
| author | niv-openerp <nicolas.vanhoren@openerp.com> | 2013-10-02 16:37:40 +0200 |
|---|---|---|
| committer | niv-openerp <nicolas.vanhoren@openerp.com> | 2013-10-02 16:37:40 +0200 |
| commit | 5a70bc038a2fa5aeb14ac3b3d95c4e619fa4e058 (patch) | |
| tree | 1af449a6d39d193ed74b7e630106b766f1399421 /addons | |
| parent | cf17ef3b3bab5d68b4b6a3d23482d8d1cde86228 (diff) | |
Changed base url
bzr revid: nicolas.vanhoren@openerp.com-20131002143740-jr8xz6j4qgs97ztp
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/web/controllers/main.py | 6 | ||||
| -rw-r--r-- | addons/web/static/src/js/chrome.js | 2 |
2 files changed, 7 insertions, 1 deletions
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'; } |