From 83f1e28cc9ca8d115ce3ae64a4538112788b85ce Mon Sep 17 00:00:00 2001
From: Joren Van Onder <jov@odoo.com>
Date: Tue, 13 Jun 2017 18:37:36 -0700
Subject: [PATCH] [FIX] web_editor,mass_mailing: adapt d7939282 to new views

Also adds body_html to the blacklisted fields. Because that tends to
be quite long as well.
---
 addons/mass_mailing/static/src/js/mass_mailing.js | 10 +++-------
 addons/web_editor/static/src/js/backend.js        |  5 ++++-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/addons/mass_mailing/static/src/js/mass_mailing.js b/addons/mass_mailing/static/src/js/mass_mailing.js
index f01d4aff8d2..75a52a940f1 100644
--- a/addons/mass_mailing/static/src/js/mass_mailing.js
+++ b/addons/mass_mailing/static/src/js/mass_mailing.js
@@ -32,17 +32,13 @@ KanbanColumn.include({
 });
 
 FieldTextHtml.include({
-    get_datarecord: function () {
+    getDatarecord: function () {
         /* Avoid extremely long URIs by whitelisting fields in the datarecord
         that get set as a get parameter */
         var datarecord = this._super();
-        if (this.view.model === 'mail.mass_mailing') {
+        if (this.model === 'mail.mass_mailing') {
             // these fields can potentially get very long, let's remove them
-            var blacklist = ['mailing_domain', 'contact_list_ids'];
-            for (var k in blacklist) {
-                delete datarecord[blacklist[k]];
-            }
-            delete datarecord[this.name];
+            datarecord = _.omit(datarecord, ['mailing_domain', 'contact_list_ids', 'body_html']);
         }
         return datarecord;
     },
diff --git a/addons/web_editor/static/src/js/backend.js b/addons/web_editor/static/src/js/backend.js
index c12ab41b4bb..11584efe384 100644
--- a/addons/web_editor/static/src/js/backend.js
+++ b/addons/web_editor/static/src/js/backend.js
@@ -236,10 +236,13 @@ var FieldTextHtml = AbstractField.extend({
         // this.$translate = $();
         return def;
     },
+    getDatarecord: function () {
+        return this.recordData;
+    },
     get_url: function (_attr) {
         var src = this.nodeOptions.editor_url || "/mass_mailing/field/email_template";
         var k;
-        var datarecord = this.recordData;
+        var datarecord = this.getDatarecord();
         var attr = {
             'model': this.model,
             'field': this.name,