From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 2AD4D608EB for ; Thu, 10 Sep 2020 07:19:21 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 268D117F7E for ; Thu, 10 Sep 2020 07:19:21 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 298BF17F71 for ; Thu, 10 Sep 2020 07:19:20 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id E9A2744AED for ; Thu, 10 Sep 2020 07:19:19 +0200 (CEST) Date: Thu, 10 Sep 2020 07:18:35 +0200 (CEST) From: Dietmar Maurer To: Proxmox Backup Server development discussion , Dominik Csapak Message-ID: <1853816273.1097.1599715115712@webmail.proxmox.com> In-Reply-To: <20200909141811.17621-1-d.csapak@proxmox.com> References: <20200909141811.17621-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Priority: 3 Importance: Normal X-Mailer: Open-Xchange Mailer v7.10.3-Rev21 X-Originating-Client: open-xchange-appsuite X-SPAM-LEVEL: Spam detection results: 0 AWL 0.080 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [proxmox.com] Subject: [pbs-devel] applied: [PATCH proxmox-backup] ui: only mark backup encrypted if there are any files X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Sep 2020 05:19:21 -0000 applied > On 09/09/2020 4:18 PM Dominik Csapak 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 > --- > 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