diff options
| author | Géry Debongnie <ged@odoo.com> | 2017-03-05 09:37:03 +0100 |
|---|---|---|
| committer | Aaron Bohy <aab@odoo.com> | 2017-04-11 19:44:38 +0200 |
| commit | 25fecd932a2bac324cc41d4326f8acdc7bbab5a9 (patch) | |
| tree | 4413e284a459633e196fd8237ebdd3810d70ae75 /addons/web/static/src/js/views | |
| parent | 47ec89d7fae16e66760240f4d34425c3277e7f07 (diff) | |
[REF] web, *: remove calls to performmodelrpc
The this.performModelRPc method is deprecated, so with this commit, we
remove some calls.
Diffstat (limited to 'addons/web/static/src/js/views')
3 files changed, 59 insertions, 55 deletions
diff --git a/addons/web/static/src/js/views/kanban/kanban_controller.js b/addons/web/static/src/js/views/kanban/kanban_controller.js index b8010c97899..83fbbf3a4bf 100644 --- a/addons/web/static/src/js/views/kanban/kanban_controller.js +++ b/addons/web/static/src/js/views/kanban/kanban_controller.js @@ -300,26 +300,28 @@ var KanbanController = BasicController.extend({ } data.context['default_' + data.groupedBy[0]] = column.id; - this.performModelRPC(data.model, "name_create", [event.data.value], { - context: data.context, - }).then( - add_record, - function (event) { - event.preventDefault(); - var popup = new form_common.SelectCreatePopup(this); - popup.select_element( - data.model, - { - title: _t("Create: "), - initial_view: "form", - disable_multiple_selection: true, - }, - [], - { default_name: event.data.value } - ); - popup.on("elements_selected", null, add_record); - } - ); + this.rpc(data.model, "name_create") + .args([event.data.value]) + .withContext(data.context) + .exec() + .then( + add_record, + function (event) { + event.preventDefault(); + var popup = new form_common.SelectCreatePopup(this); + popup.select_element( + data.model, + { + title: _t("Create: "), + initial_view: "form", + disable_multiple_selection: true, + }, + [], + { default_name: event.data.value } + ); + popup.on("elements_selected", null, add_record); + } + ); }, /** * @param {OdooEvent} event diff --git a/addons/web/static/src/js/views/kanban/kanban_model.js b/addons/web/static/src/js/views/kanban/kanban_model.js index 8970343c3a9..1448ea35ca7 100644 --- a/addons/web/static/src/js/views/kanban/kanban_model.js +++ b/addons/web/static/src/js/views/kanban/kanban_model.js @@ -98,28 +98,30 @@ return BasicModel.extend({ if (!groupByField || groupByField.type !== 'many2one') { return $.Deferred().reject(); // only supported when grouped on m2o } - return this.performModelRPC(groupByField.relation, 'name_create', [name], { - context: parent.context, // todo: combine with view context - }).then(function (result) { - var newGroup = self._makeDataPoint({ - modelName: parent.model, - context: parent.context, - domain: parent.domain.concat([[groupBy,"=",result[0]]]), - fields: parent.fields, - fieldNames: parent.fieldNames, - groupedBy: parent.groupedBy, - isOpen: true, - limit: parent.limit, - openGroupByDefault: true, - orderedBy: parent.orderedBy, - value: result, - }); + return this.rpc(groupByField.relation, 'name_create') + .args([name]) + .withContext(parent.context) // todo: combine with view context + .exec() + .then(function (result) { + var newGroup = self._makeDataPoint({ + modelName: parent.model, + context: parent.context, + domain: parent.domain.concat([[groupBy,"=",result[0]]]), + fields: parent.fields, + fieldNames: parent.fieldNames, + groupedBy: parent.groupedBy, + isOpen: true, + limit: parent.limit, + openGroupByDefault: true, + orderedBy: parent.orderedBy, + value: result, + }); - // newGroup.is_open = true; - parent.data.push(newGroup.id); - parent.count++; - return newGroup.id; - }); + // newGroup.is_open = true; + parent.data.push(newGroup.id); + parent.count++; + return newGroup.id; + }); }, }); diff --git a/addons/web/static/src/js/views/pivot/pivot_model.js b/addons/web/static/src/js/views/pivot/pivot_model.js index cd203c22d35..8683a6adbce 100644 --- a/addons/web/static/src/js/views/pivot/pivot_model.js +++ b/addons/web/static/src/js/views/pivot/pivot_model.js @@ -82,13 +82,13 @@ var PivotModel = AbstractModel.extend({ } return $.when.apply(null, groupbys.map(function (groupBy) { - return self.performModelRPC(self.modelName, 'read_group', [], { - context: self.data.context, - domain: header.domain.length ? header.domain : self.data.domain, - fields: _.map(fields, function (field) { return field.split(':')[0]; }), - groupby: groupBy, - lazy: false, - }); + return self.rpc(self.modelName, 'read_group') + .withContext(self.data.context) + .withDomain(header.domain.length ? header.domain : self.data.domain) + .withFields(_.map(fields, function (field) { return field.split(':')[0]; })) + .groupBy(groupBy) + .lazy(false) + .exec(); })).then(function () { var data = Array.prototype.slice.call(arguments); var datapt, attrs, j, l, row, col, cell_value, groupBys; @@ -513,13 +513,13 @@ var PivotModel = AbstractModel.extend({ } return $.when.apply(null, groupBys.map(function (groupBy) { - return self.performModelRPC(self.modelName, 'read_group', [], { - context: self.data.context, - domain: self.data.domain, - fields: _.map(fields, function (field) { return field.split(':')[0]; }), - groupby: groupBy, - lazy: false, - }); + return self.rpc(self.modelName, 'read_group') + .withContext(self.data.context) + .withDomain(self.data.domain) + .withFields(_.map(fields, function (field) { return field.split(':')[0]; })) + .groupBy(groupBy) + .lazy(false) + .exec(); })).then(function () { var data = Array.prototype.slice.call(arguments); if (data[0][0].__count === 0) { |
