diff options
| author | qsm-odoo <qsm@odoo.com> | 2016-01-15 13:57:23 +0100 |
|---|---|---|
| committer | qsm-odoo <qsm@odoo.com> | 2016-01-15 15:24:09 +0100 |
| commit | 5a76586edec032c77edd1097edea107bdb2abc14 (patch) | |
| tree | be2931d4fc9a707c7841f25861b5845ededdf820 | |
| parent | b9768c7022f399228639e53908531d64973f8ba5 (diff) | |
[IMP] web,point_of_sale: debug mode
Keep debug mode status when going on another location url (backend,
frontend, pos, ...).
| -rw-r--r-- | addons/point_of_sale/static/src/js/gui.js | 3 | ||||
| -rw-r--r-- | addons/web/static/src/js/action_manager.js | 9 |
2 files changed, 9 insertions, 3 deletions
diff --git a/addons/point_of_sale/static/src/js/gui.js b/addons/point_of_sale/static/src/js/gui.js index 5e8c8bf71d1..271e9332c5b 100644 --- a/addons/point_of_sale/static/src/js/gui.js +++ b/addons/point_of_sale/static/src/js/gui.js @@ -9,6 +9,7 @@ odoo.define('point_of_sale.gui', function (require) { var core = require('web.core'); var Model = require('web.DataModel'); var formats = require('web.formats'); +var session = require('web.session'); var _t = core._t; @@ -336,7 +337,7 @@ var Gui = core.Class.extend({ this.pos.push_order().then(function(){ return new Model("ir.model.data").get_func("search_read")([['name', '=', 'action_client_pos_menu']], ['res_id']) .pipe(function(res) { - window.location = '/web#action=' + res[0]['res_id']; + window.location = '/web' + ((session.debug)? '?debug' : '') + '#action=' + res[0]['res_id']; },function(err,event) { event.preventDefault(); self.show_popup('error',{ diff --git a/addons/web/static/src/js/action_manager.js b/addons/web/static/src/js/action_manager.js index ec3441eee4c..9f435bf2c6b 100644 --- a/addons/web/static/src/js/action_manager.js +++ b/addons/web/static/src/js/action_manager.js @@ -788,10 +788,15 @@ 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'); + } + if (action.target === 'self') { - framework.redirect(action.url); + framework.redirect(url); } else { - window.open(action.url, '_blank'); + window.open(url, '_blank'); } return $.when(); }, |
