[MIG] website_cookiefirst: Migration to 17.0

OCA · Oct 9, 2024 · 5c5fa5d · 5c5fa5d
1 parent 34628cf
commit 5c5fa5d
Show file tree

Hide file tree

Showing 8 changed files with 85 additions and 37 deletions.
diff --git a/website_cookiefirst/README.rst b/website_cookiefirst/README.rst
@@ -73,6 +73,11 @@ Contributors
 
    -  Ioan Galan <[email protected]>
 
+-  `NICO SOLUTIONS - ENGINEERING &
+   IT <https://www.nico-solutions.de>`__:
+
+   -  Nils Coenen [email protected]
+
 Maintainers
 -----------
 

diff --git a/website_cookiefirst/__manifest__.py b/website_cookiefirst/__manifest__.py
@@ -4,7 +4,7 @@
     "name": "Website Cookiefirst",
     "summary": "Cookiefirst integration",
     "category": "Website",
-    "version": "16.0.1.0.0",
+    "version": "17.0.1.0.0",
     "author": "Studio73, Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/website",
     "license": "AGPL-3",

diff --git a/website_cookiefirst/readme/CONTRIBUTORS.md b/website_cookiefirst/readme/CONTRIBUTORS.md
@@ -1,2 +1,4 @@
-- [Studio73](https://www.studio73.es):  
+- [Studio73](https://www.studio73.es):
   - Ioan Galan \<<[email protected]>\>
+- [NICO SOLUTIONS - ENGINEERING & IT](https://www.nico-solutions.de):
+  - Nils Coenen <[email protected]>
diff --git a/website_cookiefirst/static/description/index.html b/website_cookiefirst/static/description/index.html
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
@@ -420,6 +419,11 @@ <h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
 <li>Ioan Galan &lt;<a class="reference external" href="mailto:ioan&#64;studio73.es">ioan&#64;studio73.es</a>&gt;</li>
 </ul>
 </li>
+<li><a class="reference external" href="https://www.nico-solutions.de">NICO SOLUTIONS - ENGINEERING &amp;
+IT</a>:<ul>
+<li>Nils Coenen <a class="reference external" href="mailto:nils.coenen&#64;nico-solutions.de">nils.coenen&#64;nico-solutions.de</a></li>
+</ul>
+</li>
 </ul>
 </div>
 <div class="section" id="maintainers">

diff --git a/website_cookiefirst/tests/__init__.py b/website_cookiefirst/tests/__init__.py
@@ -0,0 +1,4 @@
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import test_website
+from . import test_res_config_settings
diff --git a/website_cookiefirst/tests/test_res_config_settings.py b/website_cookiefirst/tests/test_res_config_settings.py
@@ -0,0 +1,27 @@
+# Copyright 2023 NICO SOLUTIONS - ENGINEERNG & IT, Nils Coenen
+# License APL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo.tests.common import TransactionCase
+
+
+class TestResConfigSettings(TransactionCase):
+    def setUp(self):
+        super().setUp()
+        self.res_config_settings = self.env["res.config.settings"]
+
+    def test_cookiefirst_enabled(self):
+        website = self.env["website"].create(
+            {
+                "name": "Test Website",
+                "cookiefirst_identifier": "test_identifier",
+            }
+        )
+        res_config_settings = self.res_config_settings.create(
+            {
+                "website_id": website.id,
+                "cookiefirst_identifier": "test_identifier",
+            }
+        )
+        self.assertTrue(res_config_settings.cookiefirst_enabled)
+        res_config_settings.cookiefirst_enabled = False
+        self.assertFalse(website.cookiefirst_identifier)
diff --git a/website_cookiefirst/tests/test_website.py b/website_cookiefirst/tests/test_website.py
@@ -0,0 +1,15 @@
+# Copyright 2023 NICO SOLUTIONS - ENGINEERNG & IT, Nils Coenen
+# License APL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo.tests.common import TransactionCase
+
+
+class TestWebsite(TransactionCase):
+    def setUp(self):
+        super().setUp()
+        self.website = self.env["website"].create(
+            {"name": "Test Website", "cookiefirst_identifier": "1234567890"}
+        )
+
+    def test_cookiefirst_identifier(self):
+        self.assertEqual(self.website.cookiefirst_identifier, "1234567890")
diff --git a/website_cookiefirst/views/res_config_settings_views.xml b/website_cookiefirst/views/res_config_settings_views.xml
@@ -1,38 +1,29 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
     <record id="res_config_settings_view_form" model="ir.ui.view">
-        <field name="model">res.config.settings</field>
-        <field name="inherit_id" ref="website.res_config_settings_view_form" />
-        <field name="arch" type="xml">
-            <xpath expr="//div[@id='website_cookies_bar_setting']" position="inside">
-                <div class="o_setting_left_pane">
-                    <field name="cookiefirst_enabled" />
-                </div>
-                <div class="o_setting_right_pane">
-                    <label for="cookiefirst_enabled" />
-                    <div class="text-muted">
-                        Add Cookiefirst functionality
-                    </div>
-                    <div
-                        class="content-group"
-                        attrs="{'invisible': [('cookiefirst_enabled', '=', False)]}"
-                        id="cookiefirst_fields"
-                    >
-                        <div class="row mt16">
-                            <label
-                                class="col-md-3 o_light_label"
-                                string="Tracking ID"
-                                for="cookiefirst_identifier"
-                            />
-                            <field
-                                name="cookiefirst_identifier"
-                                placeholder="00000000-0000-0000-0000-000000000000"
-                                attrs="{'required': [('cookiefirst_enabled', '!=', False)]}"
-                            />
-                        </div>
-                    </div>
-                </div>
-            </xpath>
-        </field>
-    </record>
+       <field name="name">
+           res.config.settings.view.form.inherit.cookiefirst
+       </field>
+       <field name="model">res.config.settings</field>
+       <field name="inherit_id" ref="website.res_config_settings_view_form" />
+       <field name="arch" type="xml">
+           <xpath expr="//setting[@id='website_cookies_bar_setting']" position="after">
+               <setting id="website_cookiefirst" help="Add Cookiefirst functionality">
+                   <field name="cookiefirst_enabled" />
+                   <div class="mt16" invisible="not cookiefirst_enabled">
+                       <label
+                            class="col-md-3 o_light_label"
+                            string="Tracking ID"
+                            for="cookiefirst_identifier"
+                        />
+                       <field
+                            name="cookiefirst_identifier"
+                            required="cookiefirst_enabled"
+                            placeholder="00000000-0000-0000-0000-000000000000"
+                        />
+                   </div>
+               </setting>
+           </xpath>
+       </field>
+   </record>
 </odoo>