[MIG] web_chatter_position: Migration to 18.0

OCA · Jan 14, 2025 · af58d7f · af58d7f
1 parent 4bd1181
commit af58d7f
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 31 deletions.
diff --git a/web_chatter_position/README.rst b/web_chatter_position/README.rst
@@ -17,13 +17,13 @@ Chatter Position
     :target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html
     :alt: License: LGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fweb-lightgray.png?logo=github
-    :target: https://github.com/OCA/web/tree/17.0/web_chatter_position
+    :target: https://github.com/OCA/web/tree/18.0/web_chatter_position
     :alt: OCA/web
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/web-17-0/web-17-0-web_chatter_position
+    :target: https://translation.odoo-community.org/projects/web-18-0/web-18-0-web_chatter_position
     :alt: Translate me on Weblate
 .. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
-    :target: https://runboat.odoo-community.org/builds?repo=OCA/web&target_branch=17.0
+    :target: https://runboat.odoo-community.org/builds?repo=OCA/web&target_branch=18.0
     :alt: Try me on Runboat
 
 |badge1| |badge2| |badge3| |badge4| |badge5|
@@ -49,7 +49,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/web/issues>`_.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
-`feedback <https://github.com/OCA/web/issues/new?body=module:%20web_chatter_position%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/web/issues/new?body=module:%20web_chatter_position%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Do not contact contributors directly about support or help with technical issues.
 
@@ -66,19 +66,19 @@ Authors
 Contributors
 ------------
 
-- Hynsys Technologies <[email protected]>
-- Juan Miguel Sánchez Arce <[email protected]>
-- `Camptocamp <https://www.camptocamp.com>`__
+-  Hynsys Technologies <[email protected]>
+-  Juan Miguel Sánchez Arce <[email protected]>
+-  `Camptocamp <https://www.camptocamp.com>`__
 
-  - Iván Todorovich <[email protected]>
+   -  Iván Todorovich <[email protected]>
 
-- `Alitec Pte Ltd <http://www.alitec.sg>`__
+-  `Alitec Pte Ltd <http://www.alitec.sg>`__
 
-  - Jay Patel <[email protected]>
+   -  Jay Patel <[email protected]>
 
-- Trobz
+-  Trobz
 
-  - Tris Doan <[email protected]>
+   -  Tris Doan <[email protected]>
 
 Maintainers
 -----------
@@ -101,6 +101,6 @@ Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
 
 |maintainer-trisdoan| 
 
-This module is part of the `OCA/web <https://github.com/OCA/web/tree/17.0/web_chatter_position>`_ project on GitHub.
+This module is part of the `OCA/web <https://github.com/OCA/web/tree/18.0/web_chatter_position>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/web_chatter_position/__manifest__.py b/web_chatter_position/__manifest__.py
@@ -5,9 +5,9 @@
 {
     "name": "Chatter Position",
     "summary": "Add an option to change the chatter position",
-    "version": "17.0.1.0.1",
-    "author": "Hynsys Technologies, Camptocamp, Alitec Pte Ltd, "
-    "Odoo Community Association (OCA)",
+    "version": "18.0.1.0.0",
+    "author": "Hynsys Technologies, Camptocamp, Alitec Pte Ltd,"
+    " Odoo Community Association (OCA)",
     "maintainers": ["trisdoan"],
     "website": "https://github.com/OCA/web",
     "license": "LGPL-3",

diff --git a/web_chatter_position/static/description/index.html b/web_chatter_position/static/description/index.html
@@ -8,11 +8,10 @@
 
 /*
 :Author: David Goodger ([email protected])
-:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
 :Copyright: This stylesheet has been placed in the public domain.
 
 Default cascading style sheet for the HTML output of Docutils.
-Despite the name, some widely supported CSS2 features are used.
 
 See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
 customize this style sheet.
@@ -275,7 +274,7 @@
   margin-left: 2em ;
   margin-right: 2em }
 
-pre.code .ln { color: gray; } /* line numbers */
+pre.code .ln { color: grey; } /* line numbers */
 pre.code, code { background-color: #eeeeee }
 pre.code .comment, code .comment { color: #5C6576 }
 pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
@@ -301,7 +300,7 @@
 span.pre {
   white-space: pre }
 
-span.problematic, pre.problematic {
+span.problematic {
   color: red }
 
 span.section-subtitle {
@@ -369,7 +368,7 @@ <h1 class="title">Chatter Position</h1>
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! source digest: sha256:37fa43641cb746a03b8cb4f0492784abb34e5b511d0d318013dcee341b792da4
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/lgpl-3.0-standalone.html"><img alt="License: LGPL-3" src="https://img.shields.io/badge/licence-LGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/web/tree/17.0/web_chatter_position"><img alt="OCA/web" src="https://img.shields.io/badge/github-OCA%2Fweb-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/web-17-0/web-17-0-web_chatter_position"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/web&amp;target_branch=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/lgpl-3.0-standalone.html"><img alt="License: LGPL-3" src="https://img.shields.io/badge/licence-LGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/web/tree/18.0/web_chatter_position"><img alt="OCA/web" src="https://img.shields.io/badge/github-OCA%2Fweb-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/web-18-0/web-18-0-web_chatter_position"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/web&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>Configurable chatter position from the user preferences.</p>
 <p>Supports Both Community &amp; Enterprise Edition.</p>
 <p><strong>Table of contents</strong></p>
@@ -395,7 +394,7 @@ <h1><a class="toc-backref" href="#toc-entry-2">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/web/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/OCA/web/issues/new?body=module:%20web_chatter_position%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<a class="reference external" href="https://github.com/OCA/web/issues/new?body=module:%20web_chatter_position%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
@@ -430,15 +429,13 @@ <h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
 <div class="section" id="maintainers">
 <h2><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h2>
 <p>This module is maintained by the OCA.</p>
-<a class="reference external image-reference" href="https://odoo-community.org">
-<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
-</a>
+<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
 <p>OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.</p>
 <p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainer</a>:</p>
 <p><a class="reference external image-reference" href="https://github.com/trisdoan"><img alt="trisdoan" src="https://github.com/trisdoan.png?size=40px" /></a></p>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/web/tree/17.0/web_chatter_position">OCA/web</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/web/tree/18.0/web_chatter_position">OCA/web</a> project on GitHub.</p>
 <p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
 </div>
 </div>

diff --git a/web_chatter_position/static/src/js/web_chatter_position.esm.js b/web_chatter_position/static/src/js/web_chatter_position.esm.js
@@ -1,4 +1,3 @@
-/** @odoo-module **/
 /*
     Copyright 2023 Camptocamp SA (https://www.camptocamp.com).
     License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl).
@@ -22,15 +21,18 @@ patch(FormCompiler.prototype, {
             ".o-mail-Form-chatter:not(.o-isInFormSheetBg)"
         );
         if (!chatterContainerHookXml) {
-            return res; // No chatter, keep the result as it is
+            // No chatter, keep the result as it is
+            return res;
         }
         const chatterContainerXml = chatterContainerHookXml.querySelector(
             "t[t-component='__comp__.mailComponents.Chatter']"
         );
+        // Const chatterParent = chatterContainerXml.parentNode;
         const formSheetBgXml = res.querySelector(".o_form_sheet_bg");
         const parentXml = formSheetBgXml && formSheetBgXml.parentNode;
         if (!parentXml) {
-            return res; // Miss-config: a sheet-bg is required for the rest
+            // Miss-config: a sheet-bg is required for the rest
+            return res;
         }
 
         // Don't patch anything if the setting is "auto": this is the core behaviour
@@ -44,7 +46,7 @@ patch(FormCompiler.prototype, {
                 isChatterAside: `__comp__.uiService.size >= ${SIZES.XXL}`,
             });
             setAttributes(chatterContainerHookXml, {
-                "t-attf-class": `{{ __comp__.uiService.size >= ${SIZES.XXL} ? "o-aside" : "" }}`,
+                class: "o-aside",
             });
             // For "bottom", we keep the chatter in the form sheet
             // (the one used for the attachment viewer case)
@@ -67,7 +69,7 @@ patch(FormCompiler.prototype, {
                 setAttributes(sheetBgChatterContainerHookXml, {
                     "t-if": "true",
                     "t-attf-class": `{{ (__comp__.uiService.size >= ${SIZES.XXL} && ${
-                        odoo.web_chatter_position != "bottom"
+                        odoo.web_chatter_position !== "bottom"
                     }) ? "o-aside" : "mt-4 mt-md-0" }}`,
                 });
                 append(formSheetBgXml, sheetBgChatterContainerHookXml);
@@ -86,4 +88,15 @@ patch(FormCompiler.prototype, {
         }
         return res;
     },
+    compileForm(el, params) {
+        const form = super.compileForm(el, params);
+        const sheet = form.querySelector(".o_form_sheet_bg");
+        if (sheet && odoo.web_chatter_position === "sided") {
+            setAttributes(form, {
+                "t-attf-class": "",
+                class: "d-flex d-print-block flex-nowrap h-100",
+            });
+        }
+        return form;
+    },
 });