[pbs-devel] [PATCH proxmox-backup] ui: only mark backup encrypted if there are any files

[pbs-devel] [PATCH proxmox-backup] ui: only mark backup encrypted if there are any files

[Dominik Csapak]

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] applied: [PATCH proxmox-backup] ui: only mark backup encrypted if there are any files

[Dietmar Maurer]

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