Skip to content

Commit

Permalink
Merge PR #663 into 16.0
Browse files Browse the repository at this point in the history
Signed-off-by pedrobaeza
  • Loading branch information
OCA-git-bot committed Jun 12, 2024
2 parents affe350 + d011372 commit 77a09fb
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 7 deletions.
3 changes: 3 additions & 0 deletions vault/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,9 @@ Contributors
~~~~~~~~~~~~

* Florian Kantelberg <florian.kantelberg@initos.com>
* `Tecnativa <https://www.tecnativa.com>`_:

* Carlos Roca

Maintainers
~~~~~~~~~~~
Expand Down
3 changes: 3 additions & 0 deletions vault/readme/CONTRIBUTORS.rst
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
* Florian Kantelberg <florian.kantelberg@initos.com>
* `Tecnativa <https://www.tecnativa.com>`_:

* Carlos Roca
16 changes: 11 additions & 5 deletions vault/static/description/index.html
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -9,10 +8,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.
Expand Down Expand Up @@ -275,7 +275,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 }
Expand All @@ -301,7 +301,7 @@
span.pre {
white-space: pre }

span.problematic {
span.problematic, pre.problematic {
color: red }

span.section-subtitle {
Expand Down Expand Up @@ -429,12 +429,18 @@ <h2><a class="toc-backref" href="#toc-entry-4">Authors</a></h2>
<h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
<ul class="simple">
<li>Florian Kantelberg &lt;<a class="reference external" href="mailto:florian.kantelberg&#64;initos.com">florian.kantelberg&#64;initos.com</a>&gt;</li>
<li><a class="reference external" href="https://www.tecnativa.com">Tecnativa</a>:<ul>
<li>Carlos Roca</li>
</ul>
</li>
</ul>
</div>
<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>
Expand Down
6 changes: 4 additions & 2 deletions vault/static/src/common/utils.esm.js
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,8 @@ function generate_pass(title, options = {}) {
{
text: _t("Enter"),
classes: "btn-primary",
click: async function () {
click: async function (ev) {
ev.stopPropagation();
if (!password) throw new Error(_t("Missing password"));

dialog.close();
Expand All @@ -290,7 +291,8 @@ function generate_pass(title, options = {}) {
},
{
text: _t("Cancel"),
click: function () {
click: function (ev) {
ev.stopPropagation();
dialog.close();
reject(_t("Cancelled"));
},
Expand Down

0 comments on commit 77a09fb

Please sign in to comment.