[MERGE] forward port of branch saas-8 up to 99b6cd8

1 files changed, 8 insertions, 1 deletions

diff --git a/addons/web_editor/static/src/js/backend.js b/addons/web_editor/static/src/js/backend.js
index 3d3b6cb27ee..eca913e1309 100644
--- a/addons/web_editor/static/src/js/backend.js
+++ b/addons/web_editor/static/src/js/backend.js
@@ -194,7 +194,7 @@ var FieldTextHtml = widget.extend({
         return def;
     },
     get_url: function (_attr) {
-        var src = this.options.editor_url ? this.options.editor_url+"?" : "/web_editor/field/html?";
+        var src = this.options.editor_url || "/web_editor/field/html";
         var datarecord = this.view.get_fields_values();
 
         var attr = {
@@ -211,6 +211,9 @@ var FieldTextHtml = widget.extend({
         if (this.options.snippets) {
             attr.snippets = this.options.snippets;
         }
+        if (this.options.template) {
+            attr.template = this.options.template;
+        }
         if (!this.get("effective_readonly")) {
             attr.enable_editor = 1;
         }
@@ -227,6 +230,10 @@ var FieldTextHtml = widget.extend({
             attr[k] = _attr[k];
         }
 
+        if (src.indexOf('?') === -1) {
+            src += "?";
+        }
+
         for (var k in attr) {
             if (attr[k] !== null) {
                 src += "&"+k+"="+(_.isBoolean(attr[k]) ? +attr[k] : attr[k]);