From cf99333b83911af4a180c510a777f8f879398a3a Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Fri, 13 May 2022 14:21:52 +0200 Subject: [PATCH] ui: adapt to s/backup-ns/ns/ api param change Signed-off-by: Thomas Lamprecht --- www/datastore/Content.js | 18 +++++++++--------- www/datastore/Prune.js | 4 ++-- www/window/BackupGroupChangeOwner.js | 2 +- www/window/VerifyAll.js | 6 +++--- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/www/datastore/Content.js b/www/datastore/Content.js index 3f63c24d..5b14be5c 100644 --- a/www/datastore/Content.js +++ b/www/datastore/Content.js @@ -114,7 +114,7 @@ Ext.define('PBS.DataStoreContent', { let url = `/api2/json/admin/datastore/${view.datastore}/snapshots`; if (view.namespace && view.namespace !== '') { - url += `?backup-ns=${encodeURIComponent(view.namespace)}`; + url += `?ns=${encodeURIComponent(view.namespace)}`; } this.store.setProxy({ type: 'proxmox', @@ -160,7 +160,7 @@ Ext.define('PBS.DataStoreContent', { try { let url = `/api2/extjs/admin/datastore/${view.datastore}/groups`; if (view.namespace && view.namespace !== '') { - url += `?backup-ns=${encodeURIComponent(view.namespace)}`; + url += `?ns=${encodeURIComponent(view.namespace)}`; } let { result: { data: groups } } = await Proxmox.Async.api2({ url }); let map = {}; @@ -514,7 +514,7 @@ Ext.define('PBS.DataStoreContent', { }; } if (view.namespace && view.namespace !== '') { - params['backup-ns'] = view.namespace; + params.ns = view.namespace; } Proxmox.Utils.API2Request({ @@ -552,7 +552,7 @@ Ext.define('PBS.DataStoreContent', { }; } if (view.namespace && view.namespace !== '') { - params['backup-ns'] = view.namespace; + params.ns = view.namespace; } Ext.create('PBS.window.NotesEdit', { @@ -572,7 +572,7 @@ Ext.define('PBS.DataStoreContent', { "backup-id": data.backup_id, }; if (view.namespace && view.namespace !== '') { - params['backup-ns'] = view.namespace; + params.ns = view.namespace; } Ext.create('Proxmox.window.SafeDestroy', { @@ -609,7 +609,7 @@ Ext.define('PBS.DataStoreContent', { "backup-time": (data['backup-time'].getTime()/1000).toFixed(0), }; if (view.namespace && view.namespace !== '') { - params['backup-ns'] = view.namespace; + params.ns = view.namespace; } Proxmox.Utils.API2Request({ @@ -644,7 +644,7 @@ Ext.define('PBS.DataStoreContent', { 'backup-time': time, }; if (view.namespace && view.namespace !== '') { - params['backup-ns'] = view.namespace; + params.ns = view.namespace; } let url = `/api2/extjs/admin/datastore/${view.datastore}/protected`; @@ -719,7 +719,7 @@ Ext.define('PBS.DataStoreContent', { 'file-name': file, }; if (view.namespace && view.namespace !== '') { - params['backup-ns'] = view.namespace; + params.ns = view.namespace; } let idx = file.lastIndexOf('.'); @@ -759,7 +759,7 @@ Ext.define('PBS.DataStoreContent', { 'backup-type': type, }; if (view.namespace && view.namespace !== '') { - extraParams['backup-ns'] = view.namespace; + extraParams.ns = view.namespace; } Ext.create('Proxmox.window.FileBrowser', { title: `${type}/${id}/${timetext}`, diff --git a/www/datastore/Prune.js b/www/datastore/Prune.js index 42139c1e..4ee84865 100644 --- a/www/datastore/Prune.js +++ b/www/datastore/Prune.js @@ -50,7 +50,7 @@ Ext.define('PBS.Datastore.PruneInputPanel', { values["backup-type"] = me.backup_type; values["backup-id"] = me.backup_id; if (me.ns && me.ns !== '') { - values['backup-ns'] = me.ns; + values.ns = me.ns; } return values; }, @@ -126,7 +126,7 @@ Ext.define('PBS.Datastore.PruneInputPanel', { let params = view.getValues(); params["dry-run"] = true; if (view.ns && view.ns !== '') { - params['backup-ns'] = view.ns; + params.ns = view.ns; } Proxmox.Utils.API2Request({ diff --git a/www/window/BackupGroupChangeOwner.js b/www/window/BackupGroupChangeOwner.js index b47ddfbd..025a133a 100644 --- a/www/window/BackupGroupChangeOwner.js +++ b/www/window/BackupGroupChangeOwner.js @@ -30,7 +30,7 @@ Ext.define('PBS.BackupGroupChangeOwner', { values["backup-type"] = me.backup_type; values["backup-id"] = me.backup_id; if (me.ns && me.ns !== '') { - values['backup-ns'] = me.ns; + values.ns = me.ns; } return values; }, diff --git a/www/window/VerifyAll.js b/www/window/VerifyAll.js index 1a8d2834..b5b72a7a 100644 --- a/www/window/VerifyAll.js +++ b/www/window/VerifyAll.js @@ -24,15 +24,15 @@ Ext.define('PBS.window.VerifyAll', { data: { ignoreVerified: true }, }, onGetValues: values => { - if (!values['backup-ns'] || values['backup-ns'] === '') { - delete values['backup-ns']; + if (!values.ns || values.ns === '') { + delete values.ns; } return values; }, items: [ { xtype: 'pbsNamespaceSelector', - name: 'backup-ns', + name: 'ns', fieldLabel: gettext('Namespace'), cbind: { datastore: '{datastore}',