[pbs-devel] [PATCH proxmox-backup 1/2] ui: fix error when reloading DataStoreContent

[pbs-devel] [PATCH proxmox-backup 1/2] ui: fix error when reloading DataStoreContent

[Stefan Reiter]

...when an entry is selected, that doesn't exist after the reload.

E.g. when one deletes selects a file within a snapshot and then clicks
the delete icon for said snapshot, focusRow would then fail and the
loading mask stay on until a reload.

Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
---
 www/DataStoreContent.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/www/DataStoreContent.js b/www/DataStoreContent.js
index 5f407e98..1c08f56a 100644
--- a/www/DataStoreContent.js
+++ b/www/DataStoreContent.js
@@ -232,8 +232,10 @@ Ext.define('PBS.DataStoreContent', {
 		    }
 		    return selected === id;
 		}, undefined, true);
-		view.setSelection(selection);
-		view.getView().focusRow(selection);
+		if (selection) {
+		    view.setSelection(selection);
+		    view.getView().focusRow(selection);
+		}
 	    }
 
 	    Proxmox.Utils.setErrorMask(view, false);
-- 
2.20.1

[pbs-devel] [PATCH proxmox-backup 2/2] ui: fix in-progress snapshots always showing as "Encrypted"

[Stefan Reiter]

We can't know if they are encrypted or not when they're not even
finished yet.

Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
---
 www/DataStoreContent.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/www/DataStoreContent.js b/www/DataStoreContent.js
index 1c08f56a..e8690486 100644
--- a/www/DataStoreContent.js
+++ b/www/DataStoreContent.js
@@ -549,6 +549,9 @@ Ext.define('PBS.DataStoreContent', {
 	    header: gettext('Encrypted'),
 	    dataIndex: 'crypt-mode',
 	    renderer: (v, meta, record) => {
+		if (record.data.size === undefined || record.data.size === null) {
+		    return '';
+		}
 		if (v === -1) {
 		    return '';
 		}
-- 
2.20.1

[pbs-devel] applied: [PATCH proxmox-backup 1/2] ui: fix error when reloading DataStoreContent

[Dietmar Maurer]

applied

> On 07/28/2020 2:32 PM Stefan Reiter <s.reiter@proxmox.com> wrote:
> 
>  
> ...when an entry is selected, that doesn't exist after the reload.
> 
> E.g. when one deletes selects a file within a snapshot and then clicks
> the delete icon for said snapshot, focusRow would then fail and the
> loading mask stay on until a reload.
> 
> Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
> ---
>  www/DataStoreContent.js | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/www/DataStoreContent.js b/www/DataStoreContent.js
> index 5f407e98..1c08f56a 100644
> --- a/www/DataStoreContent.js
> +++ b/www/DataStoreContent.js
> @@ -232,8 +232,10 @@ Ext.define('PBS.DataStoreContent', {
>  		    }
>  		    return selected === id;
>  		}, undefined, true);
> -		view.setSelection(selection);
> -		view.getView().focusRow(selection);
> +		if (selection) {
> +		    view.setSelection(selection);
> +		    view.getView().focusRow(selection);
> +		}
>  	    }
>  
>  	    Proxmox.Utils.setErrorMask(view, false);
> -- 
> 2.20.1
> 
> 
> 
> _______________________________________________
> pbs-devel mailing list
> pbs-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel

[pbs-devel] applied: [PATCH proxmox-backup 2/2] ui: fix in-progress snapshots always showing as "Encrypted"

[Dietmar Maurer]

applied

> On 07/28/2020 2:32 PM Stefan Reiter <s.reiter@proxmox.com> wrote:
> 
>  
> We can't know if they are encrypted or not when they're not even
> finished yet.
> 
> Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
> ---
>  www/DataStoreContent.js | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/www/DataStoreContent.js b/www/DataStoreContent.js
> index 1c08f56a..e8690486 100644
> --- a/www/DataStoreContent.js
> +++ b/www/DataStoreContent.js
> @@ -549,6 +549,9 @@ Ext.define('PBS.DataStoreContent', {
>  	    header: gettext('Encrypted'),
>  	    dataIndex: 'crypt-mode',
>  	    renderer: (v, meta, record) => {
> +		if (record.data.size === undefined || record.data.size === null) {
> +		    return '';
> +		}
>  		if (v === -1) {
>  		    return '';
>  		}
> -- 
> 2.20.1
> 
> 
> 
> _______________________________________________
> pbs-devel mailing list
> pbs-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel