[pve-devel] [PATCH manager] www: fix PBS edit typos

[pve-devel] [PATCH manager] www: fix PBS edit typos

[Fabian Grünbichler]

and unify encryption key generation strings.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
I don't think this check for isCreate makes sense, but maybe I am
missing something?

 www/manager6/storage/PBSEdit.js | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/www/manager6/storage/PBSEdit.js b/www/manager6/storage/PBSEdit.js
index dacebfdd..a418da0c 100644
--- a/www/manager6/storage/PBSEdit.js
+++ b/www/manager6/storage/PBSEdit.js
@@ -13,16 +13,13 @@ Ext.define('Proxmox.form.PBSEncryptionCheckbox', {
 	    blabel: (get) => {
 		let v = get('value');
 		let original = get('originalValue');
-		if (get('isCreate')) {
-		    return gettext('Auto-generate a client encryption key, safed privately on cluster.');
-		}
 		if (original) {
 		    if (!v) {
-			return gettext('Warning: Existing encryption Key will be deleted!');
+			return gettext('Warning: Existing encryption key will be deleted!');
 		    }
 		    return gettext('Active');
 		} else {
-		    return gettext('Auto-generate a client encryption key, safed privately on cluster filesystem');
+		    return gettext('Auto-generate a client encryption key, saved privately on PVE cluster.');
 		}
 	    },
 	},
-- 
2.20.1

Re: [pve-devel] [PATCH manager] www: fix PBS edit typos

[Thomas Lamprecht]

On 13.08.20 12:57, Fabian Grünbichler wrote:
> and unify encryption key generation strings.
> 
> Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
> ---
> I don't think this check for isCreate makes sense, but maybe I am
> missing something?

yeah, we cannot trust "original" value in the !get('isCreate') case..

Independent of that, those changes should be two separate patches
anyway...

> 
>  www/manager6/storage/PBSEdit.js | 7 ++-----
>  1 file changed, 2 insertions(+), 5 deletions(-)
> 
> diff --git a/www/manager6/storage/PBSEdit.js b/www/manager6/storage/PBSEdit.js
> index dacebfdd..a418da0c 100644
> --- a/www/manager6/storage/PBSEdit.js
> +++ b/www/manager6/storage/PBSEdit.js
> @@ -13,16 +13,13 @@ Ext.define('Proxmox.form.PBSEncryptionCheckbox', {
>  	    blabel: (get) => {
>  		let v = get('value');
>  		let original = get('originalValue');
> -		if (get('isCreate')) {
> -		    return gettext('Auto-generate a client encryption key, safed privately on cluster.');
> -		}
>  		if (original) {
>  		    if (!v) {
> -			return gettext('Warning: Existing encryption Key will be deleted!');
> +			return gettext('Warning: Existing encryption key will be deleted!');
>  		    }
>  		    return gettext('Active');
>  		} else {
> -		    return gettext('Auto-generate a client encryption key, safed privately on cluster filesystem');
> +		    return gettext('Auto-generate a client encryption key, saved privately on PVE cluster.');
>  		}
>  	    },
>  	},
>