[MIG] website_form_require_legal: Migration to 17.0

OCA · Nov 21, 2023 · 34b46c5 · 34b46c5
1 parent 2735663
commit 34b46c5
Show file tree

Hide file tree

Showing 8 changed files with 62 additions and 61 deletions.
diff --git a/website_form_require_legal/README.rst b/website_form_require_legal/README.rst
@@ -82,6 +82,10 @@ Contributors
 
    -  Carlos Roca
 
+-  `NICO SOLUTIONS <https://www.nico-solutions.de>`__:
+
+   -  Nils Coenen
+
 Maintainers
 -----------
 

diff --git a/website_form_require_legal/__manifest__.py b/website_form_require_legal/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Website Form Require Legal",
     "summary": "Add possibility to require confirm legal terms.",
-    "version": "16.0.1.0.0",
+    "version": "17.0.1.0.0",
     "category": "Website",
     "license": "LGPL-3",
     "website": "https://github.com/OCA/website",
@@ -14,7 +14,7 @@
     "data": ["views/snippets.xml"],
     "assets": {
         "website.assets_wysiwyg": [
-            "website_form_require_legal/static/src/js/options.js",
+            "website_form_require_legal/static/src/js/options.esm.js",
             "website_form_require_legal/static/src/xml/website_form_editor.xml",
         ],
         "web.assets_frontend": [

diff --git a/website_form_require_legal/readme/CONTRIBUTORS.md b/website_form_require_legal/readme/CONTRIBUTORS.md
@@ -1,2 +1,4 @@
 - [Tecnativa](https://www.tecnativa.com):
   - Carlos Roca
+- [NICO SOLUTIONS](https://www.nico-solutions.de):
+  - Nils Coenen
diff --git a/website_form_require_legal/static/description/index.html b/website_form_require_legal/static/description/index.html
@@ -428,6 +428,10 @@ <h2><a class="toc-backref" href="#toc-entry-6">Contributors</a></h2>
 <li>Carlos Roca</li>
 </ul>
 </li>
+<li><a class="reference external" href="https://www.nico-solutions.de">NICO SOLUTIONS</a>:<ul>
+<li>Nils Coenen</li>
+</ul>
+</li>
 </ul>
 </div>
 <div class="section" id="maintainers">

diff --git a/website_form_require_legal/static/src/js/options.esm.js b/website_form_require_legal/static/src/js/options.esm.js
@@ -0,0 +1,50 @@
+/** @odoo-module **/
+
+import options from "@web_editor/js/editor/snippets.options";
+import {renderToElement} from "@web/core/utils/render";
+
+options.registry.WebsiteFormEditor.include({
+    /**
+     * @override
+     */
+    start: function () {
+        const proms = [this._super(...arguments)];
+        this.$target.find(".s_website_form_legal").attr("contentEditable", true);
+        return Promise.all(proms);
+    },
+    /**
+     * Toggle the legal terms checkbox
+     */
+    toggleLegalTerms: function () {
+        const legalTermsEl = this.$target[0].querySelector(".s_website_form_legal");
+        if (legalTermsEl) {
+            legalTermsEl.remove();
+        } else {
+            const template = document.createElement("template");
+            const labelWidth = this.$target[0].querySelector(".s_website_form_label")
+                .style.width;
+            template.content.append(
+                renderToElement("website_form_require_legal.s_website_form_legal", {
+                    labelWidth: labelWidth,
+                    termsURL: "terms",
+                })
+            );
+            const legal = template.content.firstElementChild;
+            legal.setAttribute("contentEditable", true);
+            if (this.$target.find(".s_website_form_recaptcha").length) {
+                this.$target.find(".s_website_form_recaptcha")[0].before(legal);
+            } else {
+                this.$target.find(".s_website_form_submit").before(legal);
+            }
+        }
+    },
+    /**
+     * @override
+     */
+    _computeWidgetState: function (methodName) {
+        if (methodName === "toggleLegalTerms") {
+            return !this.$target[0].querySelector(".s_website_form_legal") || "";
+        }
+        return this._super(...arguments);
+    },
+});
diff --git a/website_form_require_legal/static/src/js/options.js b/website_form_require_legal/static/src/js/options.js
diff --git a/website_form_require_legal/static/src/xml/website_form_editor.xml b/website_form_require_legal/static/src/xml/website_form_editor.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" ?>
 <templates xml:space="preserve">
     <t t-name="website_form_require_legal.s_website_form_legal">
         <div

diff --git a/website_form_require_legal/views/snippets.xml b/website_form_require_legal/views/snippets.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2023 Tecnativa - Carlos Roca
      License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). -->
 <odoo>