Merge PR #2821 into 15.0

Signed-off-by pedrobaeza
OCA · May 15, 2024 · c18a379 · c18a379
2 parents 411eef2 + 1ec0106
commit c18a379
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/web_dialog_size/README.rst b/web_dialog_size/README.rst
@@ -7,7 +7,7 @@ Web Dialog Size
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:0d044de8c4c28572d56f9256ed19f1467d687ca3134941b0969ad305a87bb6cd
+   !! source digest: sha256:fbbea6bdc60af47c7c0aedf855bceae0db4acabd389badf71be2fbe90d1861f7
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
@@ -92,6 +92,9 @@ Contributors
 * Sudhir Arya <sudhir@erpharbor.com>
 * Pierre Pizzetta <pierre@devreaction.com>
 * Mantas Šniukas <mantas@vialaurea.lt>
+* `Trobz <https://trobz.com/>`_:
+
+  * Tris Doan
 
 Maintainers
 ~~~~~~~~~~~

diff --git a/web_dialog_size/readme/CONTRIBUTORS.rst b/web_dialog_size/readme/CONTRIBUTORS.rst
@@ -14,3 +14,6 @@
 * Sudhir Arya <sudhir@erpharbor.com>
 * Pierre Pizzetta <pierre@devreaction.com>
 * Mantas Šniukas <mantas@vialaurea.lt>
+* `Trobz <https://trobz.com/>`_:
+
+  * Tris Doan
diff --git a/web_dialog_size/static/description/index.html b/web_dialog_size/static/description/index.html
@@ -367,7 +367,7 @@ <h1 class="title">Web Dialog Size</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:0d044de8c4c28572d56f9256ed19f1467d687ca3134941b0969ad305a87bb6cd
+!! source digest: sha256:fbbea6bdc60af47c7c0aedf855bceae0db4acabd389badf71be2fbe90d1861f7
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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/15.0/web_dialog_size"><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-15-0/web-15-0-web_dialog_size"><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=15.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>A module that lets the user expand/restore the dialog box size through a button
@@ -444,6 +444,10 @@ <h2><a class="toc-backref" href="#toc-entry-6">Contributors</a></h2>
 <li>Sudhir Arya &lt;<a class="reference external" href="mailto:sudhir&#64;erpharbor.com">sudhir&#64;erpharbor.com</a>&gt;</li>
 <li>Pierre Pizzetta &lt;<a class="reference external" href="mailto:pierre&#64;devreaction.com">pierre&#64;devreaction.com</a>&gt;</li>
 <li>Mantas Šniukas &lt;<a class="reference external" href="mailto:mantas&#64;vialaurea.lt">mantas&#64;vialaurea.lt</a>&gt;</li>
+<li><a class="reference external" href="https://trobz.com/">Trobz</a>:<ul>
+<li>Tris Doan</li>
+</ul>
+</li>
 </ul>
 </div>
 <div class="section" id="maintainers">

diff --git a/web_dialog_size/static/src/js/web_dialog_size.js b/web_dialog_size/static/src/js/web_dialog_size.js
@@ -2,6 +2,7 @@ odoo.define("web_dialog_size.web_dialog_size", function (require) {
     "use strict";
 
     var Dialog = require("web.Dialog");
+    var session = require("web.session");
 
     Dialog.include({
         willStart: function () {
@@ -12,7 +13,11 @@ odoo.define("web_dialog_size.web_dialog_size", function (require) {
                     .on("click", self.proxy("_extending"));
                 self.$modal
                     .find(".dialog_button_restore")
-                    .on("click", self.proxy("_restore"));
+                    .on("click", self.proxy("_restore"))
+                    .css("display", "none");
+                if (session.default_maximize) {
+                    self._extending();
+                }
             });
         },