* [pbs-devel] [PATCH proxmox-backup] ui: only mark backup encrypted if there are any files
@ 2020-09-09 14:18 Dominik Csapak
2020-09-10 5:18 ` [pbs-devel] applied: " Dietmar Maurer
0 siblings, 1 reply; 2+ messages in thread
From: Dominik Csapak @ 2020-09-09 14:18 UTC (permalink / raw)
To: pbs-devel
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* [pbs-devel] applied: [PATCH proxmox-backup] ui: only mark backup encrypted if there are any files
2020-09-09 14:18 [pbs-devel] [PATCH proxmox-backup] ui: only mark backup encrypted if there are any files Dominik Csapak
@ 2020-09-10 5:18 ` Dietmar Maurer
0 siblings, 0 replies; 2+ messages in thread
From: Dietmar Maurer @ 2020-09-10 5:18 UTC (permalink / raw)
To: Proxmox Backup Server development discussion, Dominik Csapak
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-09-10 5:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-09 14:18 [pbs-devel] [PATCH proxmox-backup] ui: only mark backup encrypted if there are any files Dominik Csapak
2020-09-10 5:18 ` [pbs-devel] applied: " Dietmar Maurer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox