From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id AA12991C79 for ; Mon, 20 Mar 2023 11:33:04 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 827D7270B for ; Mon, 20 Mar 2023 11:32:34 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Mon, 20 Mar 2023 11:32:33 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 94BCE459A9 for ; Mon, 20 Mar 2023 11:32:33 +0100 (CET) From: Aaron Lauterer To: pve-devel@lists.proxmox.com Date: Mon, 20 Mar 2023 11:32:31 +0100 Message-Id: <20230320103232.668916-2-a.lauterer@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230320103232.668916-1-a.lauterer@proxmox.com> References: <20230320103232.668916-1-a.lauterer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.041 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH v2 manager 2/3] ui: ceph: adapt urls to new ceph/pool endpoint X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Mar 2023 10:33:04 -0000 ceph/pools (plural) is deprecated, use the new one. Since the details / status of a pool has been moved from previously ceph/pools/{name} to now ceph/pool/{name}/status, we need to pass the 'loadUrl' to the edit window. Signed-off-by: Aaron Lauterer --- no changes since v1 www/manager6/ceph/Pool.js | 9 +++++---- www/manager6/form/CephPoolSelector.js | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/www/manager6/ceph/Pool.js b/www/manager6/ceph/Pool.js index f7a4d9ba..301a3f91 100644 --- a/www/manager6/ceph/Pool.js +++ b/www/manager6/ceph/Pool.js @@ -200,8 +200,9 @@ Ext.define('PVE.Ceph.PoolEdit', { cbind: { autoLoad: get => !get('isCreate'), url: get => get('isCreate') - ? `/nodes/${get('nodename')}/ceph/pools` - : `/nodes/${get('nodename')}/ceph/pools/${get('pool_name')}`, + ? `/nodes/${get('nodename')}/ceph/pool` + : `/nodes/${get('nodename')}/ceph/pool/${get('pool_name')}`, + loadUrl: get => `/nodes/${get('nodename')}/ceph/pool/${get('pool_name')}/status`, method: get => get('isCreate') ? 'POST' : 'PUT', }, @@ -356,7 +357,7 @@ Ext.define('PVE.node.Ceph.PoolList', { model: 'ceph-pool-list', proxy: { type: 'proxmox', - url: `/api2/json/nodes/${nodename}/ceph/pools`, + url: `/api2/json/nodes/${nodename}/ceph/pool`, }, }); let store = Ext.create('Proxmox.data.DiffStore', { rstore: rstore }); @@ -420,7 +421,7 @@ Ext.define('PVE.node.Ceph.PoolList', { let poolName = rec.data.pool_name; Ext.create('Proxmox.window.SafeDestroy', { showProgress: true, - url: `/nodes/${nodename}/ceph/pools/${poolName}`, + url: `/nodes/${nodename}/ceph/pool/${poolName}`, params: { remove_storages: 1, }, diff --git a/www/manager6/form/CephPoolSelector.js b/www/manager6/form/CephPoolSelector.js index e8197077..471739a9 100644 --- a/www/manager6/form/CephPoolSelector.js +++ b/www/manager6/form/CephPoolSelector.js @@ -26,7 +26,7 @@ Ext.define('PVE.form.CephPoolSelector', { ], proxy: { type: 'proxmox', - url: '/api2/json/nodes/' + me.nodename + '/ceph/pools', + url: '/api2/json/nodes/' + me.nodename + '/ceph/pool', }, }); -- 2.30.2