From 69bf1c2e3889a314427a9cd8a813a8233e33ea83 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@odoo.com>
Date: Tue, 28 Feb 2017 15:08:37 +0100
Subject: [PATCH] [REF] web,*: remove 'web.model'

Use performModelRPC instead of Model object or use ajax if performModelRPC
is not available
nb: EventDispatcherMixin include now the custom_events managment instead
of widget[REMOVE] web.dataModel
---
 static/src/js/website_form_editor.js      | 11 +++--------
 static/src/js/website_form_editor_tour.js |  4 +---
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/static/src/js/website_form_editor.js b/static/src/js/website_form_editor.js
index a02dde5fa25..49a6670006a 100644
--- a/static/src/js/website_form_editor.js
+++ b/static/src/js/website_form_editor.js
@@ -3,7 +3,6 @@ odoo.define('website_form_editor', function (require) {
 
     var core = require('web.core');
     var ajax      = require('web.ajax');
-    var Model = require('web.Model');
     var base = require('web_editor.base');
     var options = require('web_editor.snippets.options');
 
@@ -60,11 +59,8 @@ odoo.define('website_form_editor', function (require) {
 
         fetch_model_fields: function() {
             var self = this;
-            var ir_model = new Model("ir.model");
-
             this.fields_deferred = new $.Deferred();
-            ir_model.call(
-                "get_authorized_fields",
+            this.performModelRPC("ir.model", "get_authorized_fields",
                 [
                     this.$target.closest('form').attr('data-model_name')
                 ],
@@ -90,8 +86,7 @@ odoo.define('website_form_editor', function (require) {
             if (type !== 'click') return;
 
             var self = this;
-            new Model("ir.model").call(
-                "search_read",
+            this.performModelRPC("ir.model", "search_read",
                 [
                     [['website_form_access', '=', true]],
                     ['id', 'model', 'name', 'website_form_label']
@@ -350,7 +345,7 @@ odoo.define('website_form_editor', function (require) {
                 if (fields.length) {
                     // ideally we'd only do this if saving the form
                     // succeeds... but no idea how to do that
-                    new Model('ir.model.fields').call('formbuilder_whitelist', [model, _.uniq(fields)]);
+                    this.performModelRPC('ir.model.fields', 'formbuilder_whitelist', [model, _.uniq(fields)]);
                 }
             }
 
diff --git a/static/src/js/website_form_editor_tour.js b/static/src/js/website_form_editor_tour.js
index 7bb36a2125f..68e8182eafb 100644
--- a/static/src/js/website_form_editor_tour.js
+++ b/static/src/js/website_form_editor_tour.js
@@ -3,7 +3,6 @@ odoo.define('website_form_editor.tour', function(require) {
 
     var base = require('web_editor.base');
     var tour = require("web_tour.tour");
-    var Model = require('web.Model');
 
     tour.register("website_form_editor_tour", {
         test: true,
@@ -602,8 +601,7 @@ odoo.define('website_form_editor.tour', function(require) {
             content: "Check mail.mail records have been created",
             trigger: "body",
             run: function () {
-                var mailDef = new Model("mail.mail").call(
-                    "search_read",
+                var mailDef = this.performModelRPC("mail.mail", "search_read",
                     [
                         // TODO: add other fields in domain !
                         [