From: "Fabian Grünbichler" <f.gruenbichler@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH manager 2/2] ui: pools: switch to new API endpoints
Date: Mon, 20 Nov 2023 08:22:42 +0100 [thread overview]
Message-ID: <20231120072242.75599-5-f.gruenbichler@proxmox.com> (raw)
In-Reply-To: <20231120072242.75599-1-f.gruenbichler@proxmox.com>
which support nested pools. mostly straight-forward, only pool deletion and the
members grid need some special attention.
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
Notes:
Thanks Dominik for pointing me at the 'root' part of the proxy :)
www/manager6/dc/PoolView.js | 3 +++
www/manager6/grid/PoolMembers.js | 14 ++++++++------
www/manager6/pool/StatusView.js | 2 +-
3 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/www/manager6/dc/PoolView.js b/www/manager6/dc/PoolView.js
index db97cbe72..741b2025b 100644
--- a/www/manager6/dc/PoolView.js
+++ b/www/manager6/dc/PoolView.js
@@ -31,6 +31,9 @@ Ext.define('PVE.dc.PoolView', {
callback: function() {
reload();
},
+ getUrl: function(rec) {
+ return '/pools/?poolid=' + rec.getId();
+ },
});
var run_editor = function() {
diff --git a/www/manager6/grid/PoolMembers.js b/www/manager6/grid/PoolMembers.js
index 74950d80e..75f20cab1 100644
--- a/www/manager6/grid/PoolMembers.js
+++ b/www/manager6/grid/PoolMembers.js
@@ -17,8 +17,9 @@ Ext.define('PVE.pool.AddVM', {
throw "no pool specified";
}
- me.url = "/pools/" + me.pool;
+ me.url = '/pools/';
me.method = 'PUT';
+ me.extraRequestParams.poolid = me.pool;
var vmsField = Ext.create('Ext.form.field.Text', {
name: 'vms',
@@ -120,8 +121,9 @@ Ext.define('PVE.pool.AddStorage', {
me.isCreate = true;
me.isAdd = true;
- me.url = "/pools/" + me.pool;
+ me.url = "/pools/";
me.method = 'PUT';
+ me.extraRequestParams.poolid = me.pool;
Ext.apply(me, {
subject: gettext('Storage'),
@@ -168,8 +170,8 @@ Ext.define('PVE.grid.PoolMembers', {
],
proxy: {
type: 'proxmox',
- root: 'data.members',
- url: "/api2/json/pools/" + me.pool,
+ root: 'data[0].members',
+ url: "/api2/json/pools/?poolid=" + me.pool,
},
});
@@ -192,7 +194,7 @@ Ext.define('PVE.grid.PoolMembers', {
"'" + rec.data.id + "'");
},
handler: function(btn, event, rec) {
- var params = { 'delete': 1 };
+ var params = { 'delete': 1, poolid: me.pool };
if (rec.data.type === 'storage') {
params.storage = rec.data.storage;
} else if (rec.data.type === 'qemu' || rec.data.type === 'lxc' || rec.data.type === 'openvz') {
@@ -202,7 +204,7 @@ Ext.define('PVE.grid.PoolMembers', {
}
Proxmox.Utils.API2Request({
- url: '/pools/' + me.pool,
+ url: '/pools/',
method: 'PUT',
params: params,
waitMsgTarget: me,
diff --git a/www/manager6/pool/StatusView.js b/www/manager6/pool/StatusView.js
index 302ae5ab0..3d46b3b1a 100644
--- a/www/manager6/pool/StatusView.js
+++ b/www/manager6/pool/StatusView.js
@@ -24,7 +24,7 @@ Ext.define('PVE.pool.StatusView', {
};
Ext.apply(me, {
- url: "/api2/json/pools/" + pool,
+ url: "/api2/json/pools/?poolid=" + pool,
rows: rows,
});
--
2.39.2
next prev parent reply other threads:[~2023-11-20 7:23 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-20 7:22 [pve-devel] [PATCH access-control/manager 0/4] fix #1148: nested pools Fabian Grünbichler
2023-11-20 7:22 ` [pve-devel] [PATCH access-control 1/2] fix #1148: allow up to three levels of pool nesting Fabian Grünbichler
2023-11-20 7:22 ` [pve-devel] [PATCH access-control 2/2] pools: record parent/subpool information Fabian Grünbichler
2023-11-20 7:22 ` [pve-devel] [PATCH manager 1/2] fix #1148: api: pools: support nested pools Fabian Grünbichler
2023-11-20 7:22 ` Fabian Grünbichler [this message]
2023-11-20 11:27 ` [pve-devel] applied-series: [PATCH access-control/manager 0/4] fix #1148: " Wolfgang Bumiller
-- strict thread matches above, loose matches on Subject: below --
2023-11-16 15:31 [pve-devel] [RFC " Fabian Grünbichler
2023-11-17 7:09 ` [pve-devel] [PATCH manager 1/2] api: pools: support " Fabian Grünbichler
2023-11-17 7:09 ` [pve-devel] [PATCH manager 2/2] ui: pools: switch to new API endpoints Fabian Grünbichler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231120072242.75599-5-f.gruenbichler@proxmox.com \
--to=f.gruenbichler@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox