* [pbs-devel] [PATCH proxmox-backup 1/2] ui: DataStoreContent: improve encrypted column
@ 2020-09-01 9:05 Dominik Csapak
2020-09-01 9:05 ` [pbs-devel] [PATCH proxmox-backup 2/2] ui: DataStoreContent.js: fix wrong comma Dominik Csapak
2020-09-01 16:02 ` [pbs-devel] applied-series: [PATCH proxmox-backup 1/2] ui: DataStoreContent: improve encrypted column Thomas Lamprecht
0 siblings, 2 replies; 3+ messages in thread
From: Dominik Csapak @ 2020-09-01 9:05 UTC (permalink / raw)
To: pbs-devel
do not count files where we do not have any information
such files exist in the backup dir, but are not in the manifest
so we cannot use those files for determining if the backups are
encrypted or not
this marks encrypted/signed backups with unencrypted client.log.blob files as
encrypted/signed (respectively) instead of 'Mixed'
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
www/DataStoreContent.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www/DataStoreContent.js b/www/DataStoreContent.js
index 6a5cec0e..21623020 100644
--- a/www/DataStoreContent.js
+++ b/www/DataStoreContent.js
@@ -30,8 +30,8 @@ Ext.define('pbs-data-store-snapshots', {
let mode = PBS.Utils.cryptmap.indexOf(file['crypt-mode']);
if (mode !== -1) {
crypt[file['crypt-mode']]++;
+ crypt.count++;
}
- crypt.count++;
});
return PBS.Utils.calculateCryptMode(crypt);
--
2.20.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* [pbs-devel] [PATCH proxmox-backup 2/2] ui: DataStoreContent.js: fix wrong comma
2020-09-01 9:05 [pbs-devel] [PATCH proxmox-backup 1/2] ui: DataStoreContent: improve encrypted column Dominik Csapak
@ 2020-09-01 9:05 ` Dominik Csapak
2020-09-01 16:02 ` [pbs-devel] applied-series: [PATCH proxmox-backup 1/2] ui: DataStoreContent: improve encrypted column Thomas Lamprecht
1 sibling, 0 replies; 3+ messages in thread
From: Dominik Csapak @ 2020-09-01 9:05 UTC (permalink / raw)
To: pbs-devel
should be semicolon
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
www/DataStoreContent.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www/DataStoreContent.js b/www/DataStoreContent.js
index 21623020..9beb3b1f 100644
--- a/www/DataStoreContent.js
+++ b/www/DataStoreContent.js
@@ -181,7 +181,7 @@ Ext.define('PBS.DataStoreContent', {
data.children = [];
for (const file of data.files) {
- file.text = file.filename,
+ file.text = file.filename;
file['crypt-mode'] = PBS.Utils.cryptmap.indexOf(file['crypt-mode']);
file.leaf = true;
file.matchesFilter = true;
--
2.20.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* [pbs-devel] applied-series: [PATCH proxmox-backup 1/2] ui: DataStoreContent: improve encrypted column
2020-09-01 9:05 [pbs-devel] [PATCH proxmox-backup 1/2] ui: DataStoreContent: improve encrypted column Dominik Csapak
2020-09-01 9:05 ` [pbs-devel] [PATCH proxmox-backup 2/2] ui: DataStoreContent.js: fix wrong comma Dominik Csapak
@ 2020-09-01 16:02 ` Thomas Lamprecht
1 sibling, 0 replies; 3+ messages in thread
From: Thomas Lamprecht @ 2020-09-01 16:02 UTC (permalink / raw)
To: Proxmox Backup Server development discussion, Dominik Csapak
On 01.09.20 11:05, Dominik Csapak wrote:
> do not count files where we do not have any information
>
> such files exist in the backup dir, but are not in the manifest
> so we cannot use those files for determining if the backups are
> encrypted or not
>
> this marks encrypted/signed backups with unencrypted client.log.blob files as
> encrypted/signed (respectively) instead of 'Mixed'
>
> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
> ---
> www/DataStoreContent.js | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>
applied both patches, thanks!
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-09-01 16:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-01 9:05 [pbs-devel] [PATCH proxmox-backup 1/2] ui: DataStoreContent: improve encrypted column Dominik Csapak
2020-09-01 9:05 ` [pbs-devel] [PATCH proxmox-backup 2/2] ui: DataStoreContent.js: fix wrong comma Dominik Csapak
2020-09-01 16:02 ` [pbs-devel] applied-series: [PATCH proxmox-backup 1/2] ui: DataStoreContent: improve encrypted column Thomas Lamprecht
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox