Merge PR OCA#2804 into 16.0

Signed-off-by pedrobaeza
moduon · Apr 24, 2024 · 12d6756 · 12d6756
2 parents d49b988 + 171c27d
commit 12d6756
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 29 deletions.
diff --git a/web_refresher/README.rst b/web_refresher/README.rst
@@ -7,7 +7,7 @@ Web Refresher
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:a22d55e4d7881d43822b2fec799eb569243fe1f8a9d4b83bda7019fbbff4ffef
+   !! source digest: sha256:f596e04f7b0f79fd6e2e5c11b46941bf309387df1babec1a6c946ea52c996f21
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

diff --git a/web_refresher/__manifest__.py b/web_refresher/__manifest__.py
@@ -11,7 +11,20 @@
         "web.assets_backend": [
             "web_refresher/static/src/**/*.scss",
             "web_refresher/static/src/**/*.esm.js",
-            "web_refresher/static/src/**/*.xml",
+            "web_refresher/static/src/xml/refresher.xml",
+            # Load the modification of the master template just after it,
+            # for having the modification in all the primary extensions.
+            # Example: the project primary view.
+            (
+                "after",
+                "web/static/src/search/control_panel/control_panel.xml",
+                "web_refresher/static/src/xml/control_panel.xml",
+            ),
+            (
+                "after",
+                "web/static/src/views/form/control_panel/form_control_panel.xml",
+                "web_refresher/static/src/xml/form_control_panel.xml",
+            ),
         ],
     },
 }
diff --git a/web_refresher/static/description/index.html b/web_refresher/static/description/index.html
@@ -1,3 +1,4 @@
+<?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>
@@ -8,10 +9,11 @@
 
 /*
 :Author: David Goodger (goodger@python.org)
-:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z 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.
@@ -274,7 +276,7 @@
   margin-left: 2em ;
   margin-right: 2em }
 
-pre.code .ln { color: grey; } /* line numbers */
+pre.code .ln { color: gray; } /* 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 }
@@ -300,7 +302,7 @@
 span.pre {
   white-space: pre }
 
-span.problematic {
+span.problematic, pre.problematic {
   color: red }
 
 span.section-subtitle {
@@ -366,7 +368,7 @@ <h1 class="title">Web Refresher</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:a22d55e4d7881d43822b2fec799eb569243fe1f8a9d4b83bda7019fbbff4ffef
+!! source digest: sha256:f596e04f7b0f79fd6e2e5c11b46941bf309387df1babec1a6c946ea52c996f21
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/web/tree/16.0/web_refresher"><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-16-0/web-16-0-web_refresher"><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=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>Adds a button next to the pager (in trees/kanban views) to refresh the displayed list.</p>
@@ -420,7 +422,9 @@ <h2><a class="toc-backref" href="#toc-entry-4">Contributors</a></h2>
 <div class="section" id="maintainers">
 <h2><a class="toc-backref" href="#toc-entry-5">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>

diff --git a/web_refresher/static/src/xml/control_panel.xml b/web_refresher/static/src/xml/control_panel.xml
@@ -46,26 +46,4 @@
             </div>
         </xpath>
     </t>
-    <t
-        t-name="web_refresher.FormControlPanel"
-        t-inherit="web.FormControlPanel"
-        t-inherit-mode="extension"
-        owl="1"
-    >
-        <xpath expr="//div[hasclass('o_cp_pager')]" position="before">
-            <div class="oe_cp_refresher" role="search" t-ref="refresher">
-                <Refresher t-props="refresherProps" />
-            </div>
-        </xpath>
-        <xpath expr="//div[hasclass('o_cp_bottom_right')]" position="before">
-            <div
-                t-if="!display['bottom-right']"
-                class="o_cp_bottom_right d-flex flex-row-reverse"
-            >
-                <div class="oe_cp_refresher" role="search" t-ref="refresher">
-                    <Refresher refresherReport="true" />
-                </div>
-            </div>
-        </xpath>
-    </t>
 </template>
diff --git a/web_refresher/static/src/xml/form_control_panel.xml b/web_refresher/static/src/xml/form_control_panel.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!-- Copyright 2024 Tecnativa - Carlos Roca
+     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
+<template>
+    <t
+        t-name="web_refresher.FormControlPanel"
+        t-inherit="web.FormControlPanel"
+        t-inherit-mode="extension"
+        owl="1"
+    >
+        <xpath expr="//div[hasclass('o_cp_pager')]" position="before">
+            <div class="oe_cp_refresher" role="search" t-ref="refresher">
+                <Refresher t-props="refresherProps" />
+            </div>
+        </xpath>
+        <xpath expr="//div[hasclass('o_cp_bottom_right')]" position="before">
+            <div
+                t-if="!display['bottom-right']"
+                class="o_cp_bottom_right d-flex flex-row-reverse"
+            >
+                <div class="oe_cp_refresher" role="search" t-ref="refresher">
+                    <Refresher refresherReport="true" />
+                </div>
+            </div>
+        </xpath>
+    </t>
+</template>