diff options
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/js/action_manager.js | 2 | ||||
| -rw-r--r-- | addons/web/static/src/js/apps.js | 7 | ||||
| -rw-r--r-- | addons/web/static/src/js/framework/session.js | 3 |
3 files changed, 8 insertions, 4 deletions
diff --git a/addons/web/static/src/js/action_manager.js b/addons/web/static/src/js/action_manager.js index 8d33f1ab4ac..ebf2429d2ab 100644 --- a/addons/web/static/src/js/action_manager.js +++ b/addons/web/static/src/js/action_manager.js @@ -835,7 +835,7 @@ var ActionManager = Widget.extend({ ir_actions_act_url: function (action) { var url = action.url; if (session.debug && url && url.length && url[0] === '/') { - url = $.param.querystring(url, 'debug'); + url = $.param.querystring(url, {debug: session.debug}); } if (action.target === 'self') { diff --git a/addons/web/static/src/js/apps.js b/addons/web/static/src/js/apps.js index 5dd5b576fc4..520fb3210c4 100644 --- a/addons/web/static/src/js/apps.js +++ b/addons/web/static/src/js/apps.js @@ -155,8 +155,11 @@ var Apps = Widget.extend({ self.get_client().then(function(client) { self.client = client; - var qs = (session.debug ? 'debug&' : '') + 'db=' + client.dbname; - var u = client.origin + '/apps/embed/client?' + qs; + var qs = {db: client.dbname}; + if (session.debug) { + qs.debug = session.debug; + } + var u = $.param.querystring(client.origin + "/apps/embed/client", qs); var css = {width: '100%', height: '400px'}; self.$ifr = $('<iframe>').attr('src', u); diff --git a/addons/web/static/src/js/framework/session.js b/addons/web/static/src/js/framework/session.js index 2e643637052..fa83bf79044 100644 --- a/addons/web/static/src/js/framework/session.js +++ b/addons/web/static/src/js/framework/session.js @@ -32,7 +32,8 @@ var Session = core.Class.extend(mixins.EventDispatcherMixin, { this.avoid_recursion = false; this.use_cors = options.use_cors || false; this.setup(origin); - this.debug = ($.deparam($.param.querystring()).debug !== undefined); + var debug_param = $.deparam($.param.querystring()).debug; + this.debug = (debug_param !== undefined ? debug_param || 1 : false); // for historic reasons, the session requires a name to properly work // (see the methods get_cookie and set_cookie). We should perhaps |