diff options
Diffstat (limited to 'addons/web/static/src')
5 files changed, 11 insertions, 8 deletions
diff --git a/addons/web/static/src/js/_deprecated/data.js b/addons/web/static/src/js/_deprecated/data.js index acac959fcc8..71ae101da7a 100644 --- a/addons/web/static/src/js/_deprecated/data.js +++ b/addons/web/static/src/js/_deprecated/data.js @@ -835,13 +835,13 @@ var Model = Class.extend({ }, call_button: function (method, args) { pyUtils.ensure_evaluated(args, {}); + // context should be the last argument + var context = (args || []).length > 0 ? args.pop() : {}; return session.rpc('/web/dataset/call_button', { model: this.name, method: method, - // Should not be necessary anymore. Integrate remote in this? - domain_id: null, - context_id: args.length - 1, - args: args || [] + args: args || [], + kwargs: {context: context}, }); }, }); diff --git a/addons/web/static/src/js/chrome/action_manager_act_window.js b/addons/web/static/src/js/chrome/action_manager_act_window.js index ad5749a16b7..00edadb312a 100644 --- a/addons/web/static/src/js/chrome/action_manager_act_window.js +++ b/addons/web/static/src/js/chrome/action_manager_act_window.js @@ -609,11 +609,11 @@ ActionManager.include({ console.error("Could not JSON.parse arguments", actionData.args); } } - args.push(context.eval()); def = this._rpc({ route: '/web/dataset/call_button', params: { args: args, + kwargs: {context: context.eval()}, method: actionData.name, model: env.model, }, diff --git a/addons/web/static/src/js/views/basic/basic_controller.js b/addons/web/static/src/js/views/basic/basic_controller.js index edfaba60b54..19d2fd57892 100644 --- a/addons/web/static/src/js/views/basic/basic_controller.js +++ b/addons/web/static/src/js/views/basic/basic_controller.js @@ -655,7 +655,8 @@ var BasicController = AbstractController.extend(FieldManagerMixin, { params: { model: 'ir.translation', method: 'translate_fields', - args: [record.model, record.res_id, ev.data.fieldName, record.getContext()], + args: [record.model, record.res_id, ev.data.fieldName], + kwargs: {context: record.getContext()}, } }).then(function (result) { self.do_action(result, { diff --git a/addons/web/static/src/js/views/basic/basic_model.js b/addons/web/static/src/js/views/basic/basic_model.js index de7fd93d59b..d14b9074d87 100644 --- a/addons/web/static/src/js/views/basic/basic_model.js +++ b/addons/web/static/src/js/views/basic/basic_model.js @@ -3901,7 +3901,8 @@ var BasicModel = AbstractModel.extend({ return self._rpc({ model: record.model, method: 'onchange', - args: [idList, currentData, fields, onchangeSpec, context], + args: [idList, currentData, fields, onchangeSpec], + context: context, }) .then(function (result) { if (!record._changes) { diff --git a/addons/web/static/src/js/views/calendar/calendar_controller.js b/addons/web/static/src/js/views/calendar/calendar_controller.js index fa41706de2b..31e3769285e 100644 --- a/addons/web/static/src/js/views/calendar/calendar_controller.js +++ b/addons/web/static/src/js/views/calendar/calendar_controller.js @@ -300,7 +300,8 @@ var CalendarController = AbstractController.extend({ model: self.modelName, method: 'get_formview_id', //The event can be called by a view that can have another context than the default one. - args: [[id], event.context || self.context], + args: [[id]], + context: event.context || self.context, }).then(function (viewId) { self.do_action({ type:'ir.actions.act_window', |