Signed-off-by: Dominik Csapak <d.csa...@proxmox.com>
---
www/manager6/Makefile | 1 -
www/manager6/ceph/OSD.js | 6 +--
www/manager6/form/DiskSelector.js | 80 -------------------------------
www/manager6/node/Directory.js | 2 +-
www/manager6/node/LVM.js | 2 +-
www/manager6/node/LVMThin.js | 2 +-
6 files changed, 6 insertions(+), 87 deletions(-)
delete mode 100644 www/manager6/form/DiskSelector.js
diff --git a/www/manager6/Makefile b/www/manager6/Makefile
index 5656ba27..7ebd4db3 100644
--- a/www/manager6/Makefile
+++ b/www/manager6/Makefile
@@ -30,7 +30,6 @@ JSSRC=
\
form/MemoryField.js \
form/NetworkCardSelector.js \
form/DiskFormatSelector.js \
- form/DiskSelector.js \
form/BusTypeSelector.js \
form/ControllerSelector.js \
form/EmailNotificationSelector.js \
diff --git a/www/manager6/ceph/OSD.js b/www/manager6/ceph/OSD.js
index ffdfbee7..88109315 100644
--- a/www/manager6/ceph/OSD.js
+++ b/www/manager6/ceph/OSD.js
@@ -34,7 +34,7 @@ Ext.define('PVE.CephCreateOsd', {
},
column1: [
{
- xtype: 'pveDiskSelector',
+ xtype: 'pmxDiskSelector',
name: 'dev',
nodename: me.nodename,
diskType: 'unused',
@@ -44,7 +44,7 @@ Ext.define('PVE.CephCreateOsd', {
],
column2: [
{
- xtype: 'pveDiskSelector',
+ xtype: 'pmxDiskSelector',
name: 'db_dev',
nodename: me.nodename,
diskType: 'journal_disks',
@@ -80,7 +80,7 @@ Ext.define('PVE.CephCreateOsd', {
],
advancedColumn2: [
{
- xtype: 'pveDiskSelector',
+ xtype: 'pmxDiskSelector',
name: 'wal_dev',
nodename: me.nodename,
diskType: 'journal_disks',
diff --git a/www/manager6/form/DiskSelector.js
b/www/manager6/form/DiskSelector.js
deleted file mode 100644
index a1ea02e7..00000000
--- a/www/manager6/form/DiskSelector.js
+++ /dev/null
@@ -1,80 +0,0 @@
-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: {
- width: 600,
- columns: [
- {
- header: gettext('Device'),
- flex: 3,
- sortable: true,
- dataIndex: 'devpath'
- },
- {
- header: gettext('Size'),
- flex: 2,
- sortable: false,
- renderer: Proxmox.Utils.format_size,
- dataIndex: 'size'
- },
- {
- header: gettext('Serial'),
- flex: 5,
- 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'
- });
-});
diff --git a/www/manager6/node/Directory.js b/www/manager6/node/Directory.js
index e72ebe86..6e2e3c2f 100644
--- a/www/manager6/node/Directory.js
+++ b/www/manager6/node/Directory.js
@@ -22,7 +22,7 @@ Ext.define('PVE.node.CreateDirectory', {
method: 'POST',
items: [
{
- xtype: 'pveDiskSelector',
+ xtype: 'pmxDiskSelector',
name: 'device',
nodename: me.nodename,
diskType: 'unused',
diff --git a/www/manager6/node/LVM.js b/www/manager6/node/LVM.js
index 6cfdd90e..f1e068b2 100644
--- a/www/manager6/node/LVM.js
+++ b/www/manager6/node/LVM.js
@@ -22,7 +22,7 @@ Ext.define('PVE.node.CreateLVM', {
method: 'POST',
items: [
{
- xtype: 'pveDiskSelector',
+ xtype: 'pmxDiskSelector',
name: 'device',
nodename: me.nodename,
diskType: 'unused',
diff --git a/www/manager6/node/LVMThin.js b/www/manager6/node/LVMThin.js
index c466181d..8ddf3bd5 100644
--- a/www/manager6/node/LVMThin.js
+++ b/www/manager6/node/LVMThin.js
@@ -22,7 +22,7 @@ Ext.define('PVE.node.CreateLVMThin', {
method: 'POST',
items: [
{
- xtype: 'pveDiskSelector',
+ xtype: 'pmxDiskSelector',
name: 'device',
nodename: me.nodename,
diskType: 'unused',
--
2.20.1
_______________________________________________
pve-devel mailing list
pve-devel@pve.proxmox.com
https://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
