5 files changed, 42 insertions, 68 deletions
diff --git a/addons/website/static/src/js/web_planner_website.js b/addons/website/static/src/js/web_planner_website.js
index 7f196a0ce9d..ccf84c803d0 100644
--- a/addons/website/static/src/js/web_planner_website.js
+++ b/addons/website/static/src/js/web_planner_website.js
@@ -4,20 +4,24 @@ odoo.define('web.planner.website', function (require) {
 var ajax = require('web.ajax');
 var core = require('web.core');
 var planner = require('web.planner.common');
+var rpc = require('web.rpc');
 var session = require('web.session');
 var website = require('website.website');
-var model = require('website.model');
 
 var qweb = core.qweb;
 
 var WebsitePlannerLauncher = planner.PlannerLauncher.extend({
     _fetch_planner_data: function () {
-        return model.performModelRPC('web.planner', 'search_read', [[['planner_application', '=', 'planner_website']]]).then((function (planner) {
-            if (!planner.length) return;
+        return rpc.query({model: 'web.planner', method: 'search_read'})
+            .args([[['planner_application', '=', 'planner_website']]])
+            .exec({type: "ajax"})
+            .then((function (planner) {
+                planner = planner.records;
+                if (!planner.length) return;
 
-            planner[0].data = $.parseJSON(planner[0].data) || {};
-            this._setup_for_planner(planner[0]);
-        }).bind(this));
+                planner[0].data = $.parseJSON(planner[0].data) || {};
+                this._setup_for_planner(planner[0]);
+            }).bind(this));
     },
 });
 
diff --git a/addons/website/static/src/js/website.backendDashboard.js b/addons/website/static/src/js/website.backendDashboard.js
index 67a72a6de9e..94b7a89c6b9 100644
--- a/addons/website/static/src/js/website.backendDashboard.js
+++ b/addons/website/static/src/js/website.backendDashboard.js
@@ -103,9 +103,12 @@ var Dashboard = Widget.extend(ControlPanelMixin, {
         }
 
         var self = this;
-        this.performModelRPC('ir.config_parameter', 'set_param', ['google_management_client_id', ga_client_id]).then(function(){
-            self.on_date_range_button('week');
-        });
+        this._rpc('ir.config_parameter', 'set_param')
+            .args(['google_management_client_id', ga_client_id])
+            .exec()
+            .then(function(){
+                self.on_date_range_button('week');
+            });
     },
 
     render_dashboards: function() {
diff --git a/addons/website/static/src/js/website.model.js b/addons/website/static/src/js/website.model.js
deleted file mode 100644
index 66b75e398af..00000000000
--- a/addons/website/static/src/js/website.model.js
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * Service to fetch data, websites Javascript must use performModelRPC of this module
- */
-odoo.define('website.model', function (require) {
-"use strict";
-
-var Class = require('web.Class');
-var Mixins = require('web.mixins');
-var ajax = require('web.ajax');
-
-var CallService = Class.extend(Mixins.EventDispatcherMixin, {
-    custom_events: {
-        call_service: '_callService'
-    },
-    init: function () {
-        Mixins.EventDispatcherMixin.init.call(this);
-    },
-
-    //--------------------------------------------------------------------------
-    // Private
-    //--------------------------------------------------------------------------
-
-    /**
-     * @private
-     * @param {OdooEvent} event
-     */
-    _callService: function (event) {
-        var result = ajax[event.data.method].apply(ajax, event.data.args);
-        event.data.callback(result);
-    },
-});
-
-var Model =  Class.extend(Mixins.EventDispatcherMixin, Mixins.ServicesMixin, {
-    init: function (parent) {
-        Mixins.EventDispatcherMixin.init.call(this);
-        this.setParent(parent);
-    },
-});
-
-return new Model(new CallService());
-});
diff --git a/addons/website/static/src/js/website.seo.js b/addons/website/static/src/js/website.seo.js
index 3a4d6dc5000..11072cac74e 100644
--- a/addons/website/static/src/js/website.seo.js
+++ b/addons/website/static/src/js/website.seo.js
@@ -490,17 +490,20 @@ var Configurator = Dialog.extend({
             def.resolve(null);
         } else {
             var fields = ['website_meta_title', 'website_meta_description', 'website_meta_keywords'];
-            this.performModelRPC(obj.model, 'read', [[obj.id], fields, base.get_context()]).then(function (data) {
-                if (data.length) {
-                    var meta = data[0];
-                    meta.model = obj.model;
-                    def.resolve(meta);
-                } else {
-                    def.resolve(null);
-                }
-            }).fail(function () {
-                def.reject();
-            });
+            this._rpc(obj.model, 'read')
+                .args([[obj.id], fields, base.get_context()])
+                .exec()
+                .then(function (data) {
+                    if (data.length) {
+                        var meta = data[0];
+                        meta.model = obj.model;
+                        def.resolve(meta);
+                    } else {
+                        def.resolve(null);
+                    }
+                }).fail(function () {
+                    def.reject();
+                });
         }
         return def;
     },
@@ -509,7 +512,9 @@ var Configurator = Dialog.extend({
         if (!obj) {
             return $.Deferred().reject();
         } else {
-            return this.performModelRPC(obj.model, 'write', [[obj.id], data, base.get_context()]);
+            return this._rpc(obj.model, 'write')
+                .args([[obj.id], data, base.get_context()])
+                .exec();
         }
     },
     titleChanged: function () {
diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index 604c8d589f9..426c63e1d2e 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -4,6 +4,7 @@ odoo.define('website.snippets.editor', function (require) {
 var ajax = require("web.ajax");
 var core = require("web.core");
 var Dialog = require("web.Dialog");
+var rpc = require("web.rpc");
 var editor = require("web_editor.editor");
 var animation = require('web_editor.snippets.animation');
 var options = require('web_editor.snippets.options');
@@ -54,7 +55,6 @@ options.registry.menu_data = options.Class.extend({
 
 options.registry.company_data = options.Class.extend({
     start: function () {
-        var self = this;
         this._super.apply(this, arguments);
 
         var proto = options.registry.company_data.prototype;
@@ -62,11 +62,14 @@ options.registry.company_data = options.Class.extend({
         if (proto.__link_deferred === undefined) {
             proto.__link_deferred = $.Deferred();
             return ajax.jsonRpc("/web/session/get_session_info", "call").then(function (session) {
-                return self.performModelRPC("res.users", "read", [session.uid, ["company_id"]]).then(function (res) {
-                    proto.__link_deferred.resolve(
-                        "/web#action=base.action_res_company_form&view_type=form&id=" + (res && res[0] && res[0].company_id[0] || 1)
-                    );
-                });
+                return rpc.query({model: "res.users", method: "read"})
+                    .args([session.uid, ["company_id"]])
+                    .exec({type: "ajax"})
+                    .then(function (res) {
+                        proto.__link_deferred.resolve(
+                            "/web#action=base.action_res_company_form&view_type=form&id=" + (res && res[0] && res[0].company_id[0] || 1)
+                        );
+                    });
             });
         }
     },