proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-07-25 06:50:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

move DiskSelector to its own file, for generic use

Browse Source 
also set the default diskType to undefined and
change the api endpoint to /nodes/NODE/disks/list

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak 2018-07-30 10:26:07 +02:00 committed by Dietmar Maurer
parent 0d1ac958bc
commit 1c73c6e524
3 changed files with 82 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
www/manager6/Makefile
View File

@ -30,6 +30,7 @@ JSSRC= \
form/MemoryField.js \
form/NetworkCardSelector.js \
form/DiskFormatSelector.js \
form/DiskSelector.js \
form/BusTypeSelector.js \
form/ControllerSelector.js \
form/EmailNotificationSelector.js \

79
www/manager6/ceph/OSD.js
View File

@ -1,78 +1,3 @@
Ext.define('PVE.form.CephDiskSelector', {
extend: 'Proxmox.form.ComboGrid',
alias: ['widget.pveCephDiskSelector'],
diskType: 'journal_disks',
valueField: 'devpath',
displayField: 'devpath',
emptyText: gettext('No Disks unused'),
listConfig: {
columns: [
{
header: gettext('Device'),
width: 80,
sortable: true,
dataIndex: 'devpath'
},
{
header: gettext('Size'),
width: 60,
sortable: false,
renderer: Proxmox.Utils.format_size,
dataIndex: 'size'
},
{
header: gettext('Serial'),
flex: 1,
sortable: true,
dataIndex: 'serial'
}
]
},
initComponent: function() {
var me = this;
var nodename = me.nodename;
if (!nodename) {
throw "no node name specified";
}
var store = Ext.create('Ext.data.Store', {
filterOnLoad: true,
model: 'ceph-disk-list',
proxy: {
type: 'proxmox',
url: "/api2/json/nodes/" + nodename + "/ceph/disks",
extraParams: { type: me.diskType }
},
sorters: [
{
property : 'devpath',
direction: 'ASC'
}
]
});
Ext.apply(me, {
store: store
});
me.callParent();
store.load();
}
}, function() {
Ext.define('ceph-disk-list', {
extend: 'Ext.data.Model',
fields: [ 'devpath', 'used', { name: 'size', type: 'number'},
{name: 'osdid', type: 'number'},
'vendor', 'model', 'serial'],
idProperty: 'devpath'
});
});
Ext.define('PVE.CephCreateOsd', {
extend: 'Proxmox.window.Edit',
alias: ['widget.pveCephCreateOsd'],
@ -97,7 +22,7 @@ Ext.define('PVE.CephCreateOsd', {
method: 'POST',
items: [
{
xtype: 'pveCephDiskSelector',
xtype: 'pveDiskSelector',
name: 'dev',
nodename: me.nodename,
diskType: 'unused',
@ -105,7 +30,7 @@ Ext.define('PVE.CephCreateOsd', {
allowBlank: false
},
{
xtype: 'pveCephDiskSelector',
xtype: 'pveDiskSelector',
name: 'journal_dev',
nodename: me.nodename,
diskType: 'journal_disks',

79
www/manager6/form/DiskSelector.js Normal file
View File

@ -0,0 +1,79 @@
Ext.define('PVE.form.DiskSelector', {
extend: 'Proxmox.form.ComboGrid',
xtype: 'pveDiskSelector',
// can be
// undefined: all
// unused: only unused
// journal_disk: all disks with gpt
diskType: undefined,
valueField: 'devpath',
displayField: 'devpath',
emptyText: gettext('No Disks unused'),
listConfig: {
columns: [
{
header: gettext('Device'),
width: 80,
sortable: true,
dataIndex: 'devpath'
},
{
header: gettext('Size'),
width: 60,
sortable: false,
renderer: Proxmox.Utils.format_size,
dataIndex: 'size'
},
{
header: gettext('Serial'),
flex: 1,
sortable: true,
dataIndex: 'serial'
}
]
},
initComponent: function() {
var me = this;
var nodename = me.nodename;
if (!nodename) {
throw "no node name specified";
}
var store = Ext.create('Ext.data.Store', {
filterOnLoad: true,
model: 'pve-disk-list',
proxy: {
type: 'proxmox',
url: "/api2/json/nodes/" + nodename + "/disks/list",
extraParams: { type: me.diskType }
},
sorters: [
{
property : 'devpath',
direction: 'ASC'
}
]
});
Ext.apply(me, {
store: store
});
me.callParent();
store.load();
}
}, function() {
Ext.define('pve-disk-list', {
extend: 'Ext.data.Model',
fields: [ 'devpath', 'used', { name: 'size', type: 'number'},
{name: 'osdid', type: 'number'},
'vendor', 'model', 'serial'],
idProperty: 'devpath'
});
});