* [pbs-devel] [PATCH proxmox-backup 1/2] ui: fix error when reloading DataStoreContent
@ 2020-07-28 12:32 Stefan Reiter
2020-07-28 12:32 ` [pbs-devel] [PATCH proxmox-backup 2/2] ui: fix in-progress snapshots always showing as "Encrypted" Stefan Reiter
2020-07-29 5:13 ` [pbs-devel] applied: [PATCH proxmox-backup 1/2] ui: fix error when reloading DataStoreContent Dietmar Maurer
0 siblings, 2 replies; 4+ messages in thread
From: Stefan Reiter @ 2020-07-28 12:32 UTC (permalink / raw)
To: pbs-devel
...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
^ permalink raw reply [flat|nested] 4+ messages in thread
* [pbs-devel] [PATCH proxmox-backup 2/2] ui: fix in-progress snapshots always showing as "Encrypted"
2020-07-28 12:32 [pbs-devel] [PATCH proxmox-backup 1/2] ui: fix error when reloading DataStoreContent Stefan Reiter
@ 2020-07-28 12:32 ` Stefan Reiter
2020-07-29 5:13 ` [pbs-devel] applied: " Dietmar Maurer
2020-07-29 5:13 ` [pbs-devel] applied: [PATCH proxmox-backup 1/2] ui: fix error when reloading DataStoreContent Dietmar Maurer
1 sibling, 1 reply; 4+ messages in thread
From: Stefan Reiter @ 2020-07-28 12:32 UTC (permalink / raw)
To: pbs-devel
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* [pbs-devel] applied: [PATCH proxmox-backup 2/2] ui: fix in-progress snapshots always showing as "Encrypted"
2020-07-28 12:32 ` [pbs-devel] [PATCH proxmox-backup 2/2] ui: fix in-progress snapshots always showing as "Encrypted" Stefan Reiter
@ 2020-07-29 5:13 ` Dietmar Maurer
0 siblings, 0 replies; 4+ messages in thread
From: Dietmar Maurer @ 2020-07-29 5:13 UTC (permalink / raw)
To: Proxmox Backup Server development discussion, Stefan Reiter
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* [pbs-devel] applied: [PATCH proxmox-backup 1/2] ui: fix error when reloading DataStoreContent
2020-07-28 12:32 [pbs-devel] [PATCH proxmox-backup 1/2] ui: fix error when reloading DataStoreContent Stefan Reiter
2020-07-28 12:32 ` [pbs-devel] [PATCH proxmox-backup 2/2] ui: fix in-progress snapshots always showing as "Encrypted" Stefan Reiter
@ 2020-07-29 5:13 ` Dietmar Maurer
1 sibling, 0 replies; 4+ messages in thread
From: Dietmar Maurer @ 2020-07-29 5:13 UTC (permalink / raw)
To: Proxmox Backup Server development discussion, Stefan Reiter
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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-07-29 5:15 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-28 12:32 [pbs-devel] [PATCH proxmox-backup 1/2] ui: fix error when reloading DataStoreContent Stefan Reiter
2020-07-28 12:32 ` [pbs-devel] [PATCH proxmox-backup 2/2] ui: fix in-progress snapshots always showing as "Encrypted" Stefan Reiter
2020-07-29 5:13 ` [pbs-devel] applied: " Dietmar Maurer
2020-07-29 5:13 ` [pbs-devel] applied: [PATCH proxmox-backup 1/2] ui: fix error when reloading DataStoreContent Dietmar Maurer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox