From adfd2631e4ad747c17e1f663fbd69ce4d5f68456 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 19 Dec 2013 19:07:17 +0100 Subject: [PATCH] [FIX] correctly manager login query param bzr revid: fme@openerp.com-20131219180717-s9ec0oi5a0jl21o0 --- addons/web/controllers/main.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index e00e3af689b..e97314701d1 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -560,6 +560,7 @@ html_template = """ """ def webclient_bootstrap(**options): + # `options` can contain `client_options` dict. See chrome.js for more information about client_options. for res in ['js', 'css']: if res not in options: options[res] = manifest_list(res, db=options.get('db'), debug=options.get('debug', request.debug)) @@ -577,7 +578,7 @@ class Home(http.Controller): @http.route('/web', type='http', auth="none") def web_client(self, s_action=None, db=None, debug=False, **kw): - debug = bool(debug) + debug = debug is not False # we just check presence of `debug` query param # if db not provided, use the session one if db is None: @@ -782,15 +783,18 @@ class Database(http.Controller): @http.route('/web/database/selector', type='http', auth="none") def selector(self, debug=False): + debug = debug is not False # we just check presence of `debug` query param dbs = http.db_list(True) if not dbs: return redirect_with_hash('/web/database/manager', keep_query=['debug']) return env.get_template("database_selector.html").render({ - 'databases': dbs + 'databases': dbs, + 'debug': debug, }) @http.route('/web/database/manager', type='http', auth="none") def manager(self, debug=False): + debug = debug is not False # we just check presence of `debug` query param options = { 'action': 'database_manager' }