[MERGE] forward port branch saas-12.1 up to 93d736e905e

1 files changed, 10 insertions, 1 deletions

diff --git a/addons/website/static/src/js/menu/edit.js b/addons/website/static/src/js/menu/edit.js
index 24b5e067589..bc9e4646135 100644
--- a/addons/website/static/src/js/menu/edit.js
+++ b/addons/website/static/src/js/menu/edit.js
@@ -121,10 +121,19 @@ var EditPageMenu = websiteNavbarData.WebsiteNavbarActionWidget.extend({
      * expects that the save action is performed. So, this empty action is
      * defined here so that all users have an 'on_save' related action.
      *
+     * As explained above, that action should always be defined in the current
+     * implementation (even an empty one) but in fact it is also needed to
+     * remove the data-editor-message attributes which are added when entering
+     * edition.
+     *
      * @private
      * @todo improve the system to somehow declare required/optional actions
      */
-    _onSave: function () {},
+    _onSave: function () {
+        if (this.$editorMessageElements) {
+            this.$editorMessageElements.removeAttr('data-editor-message');
+        }
+    },
 
     //--------------------------------------------------------------------------
     // Private