[REF] web,*: remove 'web.model' and 'web.dataModel

Use this.rpc instead of Model object, with web.ajax if necessary.

nb: EventDispatcherMixin include now the custom_events managment instead
of widget

2 files changed, 9 insertions, 10 deletions

diff --git a/addons/website_links/static/src/js/website_links.js b/addons/website_links/static/src/js/website_links.js
index 95580483a9e..d9a729672eb 100644
--- a/addons/website_links/static/src/js/website_links.js
+++ b/addons/website_links/static/src/js/website_links.js
@@ -6,7 +6,7 @@ var core = require('web.core');
 var Widget = require('web.Widget');
 var base = require('web_editor.base');
 var website = require('website.website');
-var Model = require('web.Model');
+var model = require('website.model');
 
 var qweb = core.qweb;
 var _t = core._t;
@@ -20,7 +20,7 @@ if(!$('.o_website_links_create_tracked_url').length) {
 
     var SelectBox = Widget.extend({
         init: function(obj) {
-            this.obj = new Model(obj);
+            this.obj = obj;
         },
         start: function(element, placeholder) {
             var self = this;
@@ -49,7 +49,7 @@ if(!$('.o_website_links_create_tracked_url').length) {
             });
         },
         fetch_objects: function() {
-            return this.obj.call('search_read', [[]]).then(function(result) {
+            return model.performModelRPC(this.obj, 'search_read', [[]]).then(function(result) {
                 return _.map(result, function(val) {
                     return {id: val.id, text:val.name};
                 });
@@ -68,7 +68,7 @@ if(!$('.o_website_links_create_tracked_url').length) {
         create_object: function(name) {
             var self = this;
 
-            return this.obj.call('create', [{name:name}]).then(function(record) {
+            return model.performModelRPC(this.obj, 'create', [{name:name}]).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 bd8d2e89064..892aff45494 100644
--- a/addons/website_links/static/src/js/website_links_charts.js
+++ b/addons/website_links/static/src/js/website_links_charts.js
@@ -4,7 +4,7 @@ odoo.define('website_links.charts', function (require) {
 var Widget = require('web.Widget');
 var base = require('web_editor.base');
 var website = require('website.website');
-var Model = require('web.Model');
+var model = require('website.model');
 
 var exports = {};
 
@@ -130,7 +130,6 @@ if(!$('.o_website_links_chart').length) {
         // Get the code of the link
         var link_id = $('#link_id').val();
 
-        var clicks = new Model('link.tracker.click');
         var links_domain = ['link_id', '=', parseInt(link_id)];
 
         var total_clicks = function() {
@@ -138,24 +137,24 @@ if(!$('.o_website_links_chart').length) {
         };
 
         var clicks_by_day = function() {
-            return clicks.call('read_group', [[links_domain], ['create_date']],
+            return model.performModelRPC('link.tracker.click', 'read_group', [[links_domain], ['create_date']],
                                {'groupby':'create_date:day'});
         };
 
         var clicks_by_country = function() {
-            return clicks.call('read_group',  [[links_domain], ['country_id']], 
+            return model.performModelRPC('link.tracker.click', 'read_group',  [[links_domain], ['country_id']], 
                                {'groupby':'country_id'});
         };
 
         var last_week_clicks_by_country = function() {
             var interval = moment().subtract(7, 'days').format("YYYY-MM-DD");
-            return clicks.call('read_group', [[links_domain, ['create_date', '>', interval]], ['country_id']],
+            return model.performModelRPC('link.tracker.click', 'read_group', [[links_domain, ['create_date', '>', interval]], ['country_id']],
                                {'groupby':'country_id'});
         };
 
         var last_month_clicks_by_country = function() {
             var interval = moment().subtract(30, 'days').format("YYYY-MM-DD");
-            return clicks.call('read_group', [[links_domain, ['create_date', '>', interval]], ['country_id']],
+            return model.performModelRPC('link.tracker.click', 'read_group', [[links_domain, ['create_date', '>', interval]], ['country_id']],
                                {'groupby':'country_id'});
         };