summaryrefslogtreecommitdiff
path: root/addons/web_editor/static/src/js
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2017-06-27 14:19:31 +0200
committerChristophe Simonis <chs@odoo.com>2017-06-27 14:19:31 +0200
commitdd43071638773dcb58376b79ec7b1456c8b0454d (patch)
treefd7935e2aa93de03fa3fe12507f8ef74405a255e /addons/web_editor/static/src/js
parent6501184e6294ffb06e24a0ec8e9666b79a80b59a (diff)
parent278e478d55209bd958836fde7fe1c82c555180dc (diff)
[MERGE] forward port branch saas-16 up to 278e478d552
Diffstat (limited to 'addons/web_editor/static/src/js')
-rw-r--r--addons/web_editor/static/src/js/backend.js8
1 files changed, 6 insertions, 2 deletions
diff --git a/addons/web_editor/static/src/js/backend.js b/addons/web_editor/static/src/js/backend.js
index c12ab41b4bb..34ca6c9f5d4 100644
--- a/addons/web_editor/static/src/js/backend.js
+++ b/addons/web_editor/static/src/js/backend.js
@@ -192,6 +192,7 @@ var FieldTextHtmlSimple = basic_fields.DebouncedField.extend({
var FieldTextHtml = AbstractField.extend({
template: 'web_editor.FieldTextHtml',
supportedFieldTypes: ['html'],
+
start: function () {
var self = this;
@@ -206,7 +207,7 @@ var FieldTextHtml = AbstractField.extend({
};
window.odoo[this.callback+"_updown"] = null;
window.odoo[this.callback+"_downup"] = function (value) {
- self.set_value(value);
+ self._setValue(value);
self.resize();
};
@@ -236,10 +237,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,