From 25fecd932a2bac324cc41d4326f8acdc7bbab5a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9ry=20Debongnie?= Date: Sun, 5 Mar 2017 09:37:03 +0100 Subject: [REF] web, *: remove calls to performmodelrpc The this.performModelRPc method is deprecated, so with this commit, we remove some calls. --- addons/web/static/src/js/widgets/model_field_selector.js | 14 ++++++++------ addons/web/static/src/js/widgets/switch_company_menu.js | 9 ++++++--- 2 files changed, 14 insertions(+), 9 deletions(-) (limited to 'addons/web/static/src/js/widgets') diff --git a/addons/web/static/src/js/widgets/model_field_selector.js b/addons/web/static/src/js/widgets/model_field_selector.js index 9c843937c90..a1fb3cc5c4b 100644 --- a/addons/web/static/src/js/widgets/model_field_selector.js +++ b/addons/web/static/src/js/widgets/model_field_selector.js @@ -317,12 +317,14 @@ var ModelFieldSelector = Widget.extend({ _getModelFieldsFromCache: function (model, filters) { var def = modelFieldsCache.cacheDefs[model]; if (!def) { - def = modelFieldsCache.cacheDefs[model] = this.performModelRPC(model, "fields_get", [ - false, - ["store", "searchable", "type", "string", "relation", "selection", "related"], - ]).then((function (fields) { - modelFieldsCache.cache[model] = sortFields(fields); - }).bind(this)); + def = modelFieldsCache.cacheDefs[model] = this.rpc(model, "fields_get") + .args([ + false, + ["store", "searchable", "type", "string", "relation", "selection", "related"]]) + .exec() + .then((function (fields) { + modelFieldsCache.cache[model] = sortFields(fields); + }).bind(this)); } return def.then((function () { return _.filter(modelFieldsCache.cache[model], function (f) { diff --git a/addons/web/static/src/js/widgets/switch_company_menu.js b/addons/web/static/src/js/widgets/switch_company_menu.js index b953791eec2..feaf487fcc7 100644 --- a/addons/web/static/src/js/widgets/switch_company_menu.js +++ b/addons/web/static/src/js/widgets/switch_company_menu.js @@ -18,9 +18,12 @@ var SwitchCompanyMenu = Widget.extend({ this.$el.on('click', '.dropdown-menu li a[data-menu]', _.debounce(function(ev) { ev.preventDefault(); var company_id = $(ev.currentTarget).data('company-id'); - self.performModelRPC('res.users', 'write', [[session.uid], {'company_id': company_id}]).then(function() { - location.reload(); - }); + self.rpc('res.users', 'write') + .args([[session.uid], {'company_id': company_id}]) + .exec() + .then(function() { + location.reload(); + }); }, 1500, true)); self.$('.oe_topbar_name').text(session.user_companies.current_company[1]); -- cgit v1.2.3