From 8d6c4e421e9565b835f8343099a0d8a7da84b1ef Mon Sep 17 00:00:00 2001
From: "Guillaume (gdi)" <gdi@odoo.com>
Date: Tue, 26 Apr 2022 13:43:49 +0000
Subject: [PATCH] [FIX] web_editor: fix form not saved

Before this commit, the modifications of the form were not saved if the
user had only clicked on the submit button of the form. Only elements
with the class o_dirty are saved, but since this commit [1], the
observer that adds this class was disabled. The resolution of the bug is
just to remove the fact that the link tool disables the observer that
adds the o_dirty class. This commit also adds a test to make sure that
this bug does not happen again.

Here are the steps to see the bug:
- Go to /contactus page
- Click on edit
- Click on the Submit button
- Change a Form option (eg: Recipient Email, Labels Width, URL, ...)
- Save

Edit again the see that the changes are not saved

[1]: https://github.com/odoo/odoo/commit/c29fe9fa8fc8ff4a5e6f042607ef9b3070d1d339

task-2812722

Forward-port-of: #90064
X-original-commit: 3b45ef633adbeebee4819c30808680644b85c5fc
Part-of: odoo/odoo#91074
---
 .../src/js/wysiwyg/widgets/link_tools.js      |  4 ---
 .../static/tests/tours/website_form_editor.js | 33 ++++++++++++++++---
 2 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/addons/web_editor/static/src/js/wysiwyg/widgets/link_tools.js b/addons/web_editor/static/src/js/wysiwyg/widgets/link_tools.js
index 9d1ecbfbafc..e7abba60cf7 100644
--- a/addons/web_editor/static/src/js/wysiwyg/widgets/link_tools.js
+++ b/addons/web_editor/static/src/js/wysiwyg/widgets/link_tools.js
@@ -45,7 +45,6 @@ const LinkTools = Link.extend({
      * @override
      */
     start: function () {
-        this.options.wysiwyg.odooEditor.observerUnactive();
         this.$link.addClass('oe_edited_link');
         this.$button.addClass('active');
         return this._super(...arguments);
@@ -60,7 +59,6 @@ const LinkTools = Link.extend({
             $contents.unwrap();
         }
         this.$button.removeClass('active');
-        this.options.wysiwyg.odooEditor.observerActive();
         this.applyLinkToDom(this._getData());
         if (!this.options.wysiwyg.odooEditor.isDestroyed) {
             this.options.wysiwyg.odooEditor.historyStep();
@@ -71,9 +69,7 @@ const LinkTools = Link.extend({
 
     applyLinkToDom() {
         this._observer.disconnect();
-        this.options.wysiwyg.odooEditor.observerActive();
         this._super(...arguments);
-        this.options.wysiwyg.odooEditor.observerUnactive();
         this._observer.observe(this._link, {subtree: true, childList: true, characterData: true});
     },
 
diff --git a/addons/website/static/tests/tours/website_form_editor.js b/addons/website/static/tests/tours/website_form_editor.js
index c3ff35ad6f7..ef1648231b8 100644
--- a/addons/website/static/tests/tours/website_form_editor.js
+++ b/addons/website/static/tests/tours/website_form_editor.js
@@ -136,10 +136,6 @@ odoo.define('website.tour.form_editor', function (require) {
         {
             content: "Form has a model name",
             trigger: 'section.s_website_form form[data-model_name="mail.mail"]',
-        }, {
-            content: "Complete Recipient E-mail",
-            trigger: '[data-field-name="email_to"] input',
-            run: 'text_blur test@test.test',
         }, {
             content: 'Edit the Phone Number field',
             trigger: 'input[name="phone"]',
@@ -348,7 +344,34 @@ odoo.define('website.tour.form_editor', function (require) {
         {
             content: 'Verify that the value has not been deleted',
             trigger: '.s_website_form_field:eq(0) input[value="John Smith"]',
-        }
+        },
+        {
+            content: 'Enter in edit mode again',
+            trigger: 'a[data-action="edit"]',
+            run: 'click',
+        },
+        {
+            content: 'Click on the submit button',
+            trigger: '.s_website_form_send',
+            extra_trigger: 'button[data-action="save"]',
+            run: 'click',
+        },
+        {
+            content: 'Change the Recipient Email',
+            trigger: '[data-field-name="email_to"] input',
+            run: 'text test@test.test',
+        },
+        {
+            content: 'Save the page',
+            trigger: 'button[data-action=save]',
+            run: 'click',
+        },
+        {
+            content: 'Verify that the recipient email has been saved',
+            trigger: 'body:not(.editor_enable)',
+            // We have to this that way because the input type = hidden.
+            extra_trigger: 'form:has(input[name="email_to"][value="test@test.test"])',
+        },
     ]);
 
     tour.register("website_form_editor_tour_submit", {