From: Dietmar Maurer <dietmar@proxmox.com>
To: Proxmox Backup Server development discussion
<pbs-devel@lists.proxmox.com>,
Dominik Csapak <d.csapak@proxmox.com>
Subject: [pbs-devel] applied: [PATCH proxmox-backup] ui: only mark backup encrypted if there are any files
Date: Thu, 10 Sep 2020 07:18:35 +0200 (CEST) [thread overview]
Message-ID: <1853816273.1097.1599715115712@webmail.proxmox.com> (raw)
In-Reply-To: <20200909141811.17621-1-d.csapak@proxmox.com>
applied
> On 09/09/2020 4:18 PM Dominik Csapak <d.csapak@proxmox.com> wrote:
>
>
> if we have a stale backup without an manifest, we do not count
> the remaining files in the backup dir anymore, but this means
> we now have to check here if there are really any encrypted
>
> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
> ---
> www/Utils.js | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/www/Utils.js b/www/Utils.js
> index dfd10cf8..7bcf1ba6 100644
> --- a/www/Utils.js
> +++ b/www/Utils.js
> @@ -41,9 +41,9 @@ Ext.define('PBS.Utils', {
> let files = data.count;
> if (mixed > 0) {
> return PBS.Utils.cryptmap.indexOf('mixed');
> - } else if (files === encrypted) {
> + } else if (files === encrypted && encrypted > 0) {
> return PBS.Utils.cryptmap.indexOf('encrypt');
> - } else if (files === signed) {
> + } else if (files === signed && signed > 0) {
> return PBS.Utils.cryptmap.indexOf('sign-only');
> } else if ((signed+encrypted) === 0) {
> return PBS.Utils.cryptmap.indexOf('none');
> --
> 2.20.1
>
>
>
> _______________________________________________
> pbs-devel mailing list
> pbs-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
prev parent reply other threads:[~2020-09-10 5:19 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-09 14:18 [pbs-devel] " Dominik Csapak
2020-09-10 5:18 ` Dietmar Maurer [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1853816273.1097.1599715115712@webmail.proxmox.com \
--to=dietmar@proxmox.com \
--cc=d.csapak@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox