proxmox-mirrors/proxmox-widget-toolkit
1
0
Fork 1
mirror of https://git.proxmox.com/git/proxmox-widget-toolkit synced 2025-06-28 04:44:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix #2933: correct behaviour of initgpt button

Browse Source 
fixes 4 issues:
* use correct /api2/ext url to get the 'success' parameter
* check 'used' property for 'unused' (pbs vs pve)
* use 'name' instead of 'devpath' for id
  (name always contains the correct id for the product,
  e.g. /dev/sdd for pve and sdd for pbs)
* add a reload in taskDone to reload the list of disks when the inti is done

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak 2020-08-14 10:33:52 +02:00 committed by Thomas Lamprecht
parent aa941c21aa
commit abd4706afe
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/grid/DiskList.js
View File

@ -73,10 +73,10 @@ Ext.define('Proxmox.DiskList', {
let rec = selection[0]; let rec = selection[0];
Proxmox.Utils.API2Request({ Proxmox.Utils.API2Request({
url: `${view.baseurl}/initgpt`, url: `${view.exturl}/initgpt`,
waitMsgTarget: view, waitMsgTarget: view,
method: 'POST', method: 'POST',
params: { disk: rec.data.devpath }, params: { disk: rec.data.name },
failure: function(response, options) { failure: function(response, options) {
Ext.Msg.alert(gettext('Error'), response.htmlStatus); Ext.Msg.alert(gettext('Error'), response.htmlStatus);
}, },
@ -84,6 +84,9 @@ Ext.define('Proxmox.DiskList', {
var upid = response.result.data; var upid = response.result.data;
var win = Ext.create('Proxmox.window.TaskProgress', { var win = Ext.create('Proxmox.window.TaskProgress', {
upid: upid, upid: upid,
taskDone: function() {
me.reload()
}
}); });
win.show(); win.show();
}, },
@ -95,6 +98,7 @@ Ext.define('Proxmox.DiskList', {
let nodename = view.nodename || 'localhost'; let nodename = view.nodename || 'localhost';
view.baseurl = `/api2/json/nodes/${nodename}/disks`; view.baseurl = `/api2/json/nodes/${nodename}/disks`;
view.exturl = `/api2/extjs/nodes/${nodename}/disks`;
view.getStore().getProxy().setUrl(`${view.baseurl}/list`); view.getStore().getProxy().setUrl(`${view.baseurl}/list`);
view.getStore().load(); view.getStore().load();
}, },
@ -129,7 +133,7 @@ Ext.define('Proxmox.DiskList', {
text: gettext('Initialize Disk with GPT'), text: gettext('Initialize Disk with GPT'),
disabled: true, disabled: true,
enableFn: function(rec) { enableFn: function(rec) {
if (!rec || rec.data.used) { if (!rec || (rec.data.used && rec.data.used !== 'unused')) {
return false; return false;
} else { } else {
return true; return true;