[REF] *: use _rpc method for all rpcs

The _rpc method is now the preferred method to do a rpc, so we need to
update all calls.

2 files changed, 34 insertions, 19 deletions

diff --git a/addons/website_links/static/src/js/website_links.js b/addons/website_links/static/src/js/website_links.js
index d9a729672eb..e7e12589843 100644
--- a/addons/website_links/static/src/js/website_links.js
+++ b/addons/website_links/static/src/js/website_links.js
@@ -3,10 +3,10 @@ odoo.define('website_links.website_links', function (require) {
 
 var ajax = require('web.ajax');
 var core = require('web.core');
+var rpc = require('web.rpc');
 var Widget = require('web.Widget');
 var base = require('web_editor.base');
 var website = require('website.website');
-var model = require('website.model');
 
 var qweb = core.qweb;
 var _t = core._t;
@@ -49,11 +49,13 @@ if(!$('.o_website_links_create_tracked_url').length) {
             });
         },
         fetch_objects: function() {
-            return model.performModelRPC(this.obj, 'search_read', [[]]).then(function(result) {
-                return _.map(result, function(val) {
-                    return {id: val.id, text:val.name};
+            return rpc.query({model: this.obj, method: 'search_read'})
+                .exec({type: "ajax"})
+                .then(function(result) {
+                    return _.map(result, function(val) {
+                        return {id: val.id, text:val.name};
+                    });
                 });
-            });
         },
         object_exists: function(query) {
             return _.find(this.objects, function(val) {
@@ -68,10 +70,13 @@ if(!$('.o_website_links_create_tracked_url').length) {
         create_object: function(name) {
             var self = this;
 
-            return model.performModelRPC(this.obj, 'create', [{name:name}]).then(function(record) {
-                self.element.attr('value', record);
-                self.objects.push({'id': record, 'text': name});
-            });
+            return rpc.query({model: this.obj, method: 'create'})
+                .args([{name:name}])
+                .exec({type: "ajax"})
+                .then(function(record) {
+                    self.element.attr('value', record);
+                    self.objects.push({'id': record, 'text': name});
+                });
         },
     });
     
diff --git a/addons/website_links/static/src/js/website_links_charts.js b/addons/website_links/static/src/js/website_links_charts.js
index 892aff45494..a0033f0148e 100644
--- a/addons/website_links/static/src/js/website_links_charts.js
+++ b/addons/website_links/static/src/js/website_links_charts.js
@@ -1,10 +1,10 @@
 odoo.define('website_links.charts', function (require) {
 'use strict';
 
+var rpc = require('web.rpc');
 var Widget = require('web.Widget');
 var base = require('web_editor.base');
 var website = require('website.website');
-var model = require('website.model');
 
 var exports = {};
 
@@ -133,29 +133,39 @@ if(!$('.o_website_links_chart').length) {
         var links_domain = ['link_id', '=', parseInt(link_id)];
 
         var total_clicks = function() {
-            return clicks.call('search_count', [[links_domain]]);
+            return rpc.query({model: 'link.tracker.click', method: 'search_count'})
+                .args([[links_domain]])
+                .exec({type: "ajax"});
         };
 
         var clicks_by_day = function() {
-            return model.performModelRPC('link.tracker.click', 'read_group', [[links_domain], ['create_date']],
-                               {'groupby':'create_date:day'});
+            return rpc.query({model: 'link.tracker.click', method: 'read_group'})
+                .args([[links_domain], ['create_date']])
+                .kwargs({'groupby':'create_date:day'})
+                .exec({type: "ajax"});
         };
 
         var clicks_by_country = function() {
-            return model.performModelRPC('link.tracker.click', 'read_group',  [[links_domain], ['country_id']], 
-                               {'groupby':'country_id'});
+            return rpc.query({model: 'link.tracker.click', method: 'read_group'})
+                .args([[links_domain], ['country_id']])
+                .kwargs({'groupby':'country_id'})
+                .exec({type: "ajax"});
         };
 
         var last_week_clicks_by_country = function() {
             var interval = moment().subtract(7, 'days').format("YYYY-MM-DD");
-            return model.performModelRPC('link.tracker.click', 'read_group', [[links_domain, ['create_date', '>', interval]], ['country_id']],
-                               {'groupby':'country_id'});
+            return rpc.query({model: 'link.tracker.click', method: 'read_group'})
+                .args([[links_domain, ['create_date', '>', interval]], ['country_id']])
+                .kwargs({'groupby':'country_id'})
+                .exec({type: "ajax"});
         };
 
         var last_month_clicks_by_country = function() {
             var interval = moment().subtract(30, 'days').format("YYYY-MM-DD");
-            return model.performModelRPC('link.tracker.click', 'read_group', [[links_domain, ['create_date', '>', interval]], ['country_id']],
-                               {'groupby':'country_id'});
+            return rpc.query({model: 'link.tracker.click', method: 'read_group'})
+                .args([[links_domain, ['create_date', '>', interval]], ['country_id']])
+                .kwargs({'groupby':'country_id'})
+                .exec({type: "ajax"});
         };
 
         $.when(total_clicks(),