From 56a353b9e78f3b375122a0c0d00751ef78745ab7 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Mon, 11 Dec 2017 14:46:51 +0100 Subject: [PATCH] use RestProxy from widget toolkit Split PVE specific models, which where not moved to the general widget toolkit, in a separate folder: data/models/ Signed-off-by: Thomas Lamprecht Reviewed-by: Dominik Csapak --- www/manager6/Makefile | 2 +- www/manager6/ceph/Monitor.js | 2 +- www/manager6/ceph/OSD.js | 2 +- www/manager6/ceph/Pool.js | 4 +- www/manager6/ceph/Status.js | 2 +- www/manager6/data/PVEProxy.js | 103 --------------------- www/manager6/data/ResourceStore.js | 2 +- www/manager6/data/model/Realm.js | 29 ++++++ www/manager6/dc/ACLView.js | 2 +- www/manager6/dc/Backup.js | 2 +- www/manager6/dc/Health.js | 2 +- www/manager6/dc/Log.js | 4 +- www/manager6/dc/SecurityGroups.js | 2 +- www/manager6/dc/StorageView.js | 2 +- www/manager6/dc/Summary.js | 2 +- www/manager6/dc/Tasks.js | 4 +- www/manager6/form/BridgeSelector.js | 2 +- www/manager6/form/CephPoolSelector.js | 2 +- www/manager6/form/FileSelector.js | 2 +- www/manager6/form/GlobalSearchField.js | 2 +- www/manager6/form/GroupSelector.js | 2 +- www/manager6/form/IPRefSelector.js | 2 +- www/manager6/form/NodeSelector.js | 2 +- www/manager6/form/PoolSelector.js | 2 +- www/manager6/form/RoleSelector.js | 2 +- www/manager6/form/SecurityGroupSelector.js | 2 +- www/manager6/form/SnapshotSelector.js | 2 +- www/manager6/form/StorageSelector.js | 2 +- www/manager6/form/USBSelector.js | 2 +- www/manager6/form/UserSelector.js | 2 +- www/manager6/grid/BackupView.js | 2 +- www/manager6/grid/FirewallAliases.js | 2 +- www/manager6/grid/FirewallRules.js | 4 +- www/manager6/grid/PoolMembers.js | 2 +- www/manager6/grid/Replication.js | 2 +- www/manager6/ha/GroupSelector.js | 2 +- www/manager6/ha/Status.js | 2 +- www/manager6/node/Disks.js | 4 +- www/manager6/panel/IPSet.js | 4 +- www/manager6/storage/ContentView.js | 4 +- www/manager6/storage/GlusterFsEdit.js | 2 +- www/manager6/storage/IScsiEdit.js | 2 +- www/manager6/storage/LVMEdit.js | 4 +- www/manager6/storage/LvmThinEdit.js | 4 +- www/manager6/storage/NFSEdit.js | 2 +- www/manager6/storage/ZFSPoolEdit.js | 2 +- 46 files changed, 82 insertions(+), 156 deletions(-) delete mode 100644 www/manager6/data/PVEProxy.js create mode 100644 www/manager6/data/model/Realm.js diff --git a/www/manager6/Makefile b/www/manager6/Makefile index 1d0d8a72..39ccc346 100644 --- a/www/manager6/Makefile +++ b/www/manager6/Makefile @@ -14,8 +14,8 @@ JSSRC= \ lxc/CmdMenu.js \ node/CmdMenu.js \ VNCConsole.js \ - data/PVEProxy.js \ data/ResourceStore.js \ + data/model/Realm.js \ data/model/RRDModels.js \ form/VLanField.js \ form/Boolean.js \ diff --git a/www/manager6/ceph/Monitor.js b/www/manager6/ceph/Monitor.js index d588441a..8093ed0a 100644 --- a/www/manager6/ceph/Monitor.js +++ b/www/manager6/ceph/Monitor.js @@ -72,7 +72,7 @@ Ext.define('PVE.node.CephMonList', { storeid: 'ceph-mon-list' + nodename, model: 'ceph-mon-list', proxy: { - type: 'pve', + type: 'proxmox', url: "/api2/json/nodes/" + nodename + "/ceph/mon" } }); diff --git a/www/manager6/ceph/OSD.js b/www/manager6/ceph/OSD.js index 24d98496..684c7f30 100644 --- a/www/manager6/ceph/OSD.js +++ b/www/manager6/ceph/OSD.js @@ -42,7 +42,7 @@ Ext.define('PVE.form.CephDiskSelector', { filterOnLoad: true, model: 'ceph-disk-list', proxy: { - type: 'pve', + type: 'proxmox', url: "/api2/json/nodes/" + nodename + "/ceph/disks", extraParams: { type: me.diskType } }, diff --git a/www/manager6/ceph/Pool.js b/www/manager6/ceph/Pool.js index 58af5cbf..ed453b42 100644 --- a/www/manager6/ceph/Pool.js +++ b/www/manager6/ceph/Pool.js @@ -157,7 +157,7 @@ Ext.define('PVE.node.CephPoolList', { storeid: 'ceph-pool-list' + nodename, model: 'ceph-pool-list', proxy: { - type: 'pve', + type: 'proxmox', url: "/api2/json/nodes/" + nodename + "/ceph/pools" } }); @@ -257,7 +257,7 @@ Ext.define('PVE.form.CephRuleSelector', { fields: ['name'], sorters: 'name', proxy: { - type: 'pve', + type: 'proxmox', url: '/api2/json/nodes/' + me.nodename + '/ceph/rules' } }); diff --git a/www/manager6/ceph/Status.js b/www/manager6/ceph/Status.js index d52e7311..02abb81f 100644 --- a/www/manager6/ceph/Status.js +++ b/www/manager6/ceph/Status.js @@ -272,7 +272,7 @@ Ext.define('PVE.node.CephStatus', { storeid: 'ceph-status-' + nodename, interval: 5000, proxy: { - type: 'pve', + type: 'proxmox', url: '/api2/json/nodes/' + nodename + '/ceph/status' } }); diff --git a/www/manager6/data/PVEProxy.js b/www/manager6/data/PVEProxy.js deleted file mode 100644 index f8f918ff..00000000 --- a/www/manager6/data/PVEProxy.js +++ /dev/null @@ -1,103 +0,0 @@ -Ext.define('PVE.RestProxy', { - extend: 'Ext.data.RestProxy', - alias : 'proxy.pve', - - pageParam : null, - startParam: null, - limitParam: null, - groupParam: null, - sortParam: null, - filterParam: null, - noCache : false, - afterRequest: function(request, success) { - this.fireEvent('afterload', this, request, success); - return; - }, - - constructor: function(config) { - - Ext.applyIf(config, { - reader: { - type: 'json', - rootProperty: config.root || 'data' - } - }); - - this.callParent([config]); - } - -}, function() { - - Ext.define('pve-domains', { - extend: "Ext.data.Model", - fields: [ 'realm', 'type', 'comment', 'default', 'tfa', - { - name: 'descr', - // Note: We use this in the RealmComboBox.js - // (see Bug #125) - convert: function(value, record) { - var info = record.data; - var text; - - if (value) { - return value; - } - // return realm if there is no comment - text = info.comment || info.realm; - - if (info.tfa) { - text += " (+ " + info.tfa + ")"; - } - - return Ext.String.htmlEncode(text); - } - } - ], - idProperty: 'realm', - proxy: { - type: 'pve', - url: "/api2/json/access/domains" - } - }); - - Ext.define('KeyValue', { - extend: "Ext.data.Model", - fields: [ 'key', 'value' ], - idProperty: 'key' - }); - - Ext.define('KeyValuePendingDelete', { - extend: "Ext.data.Model", - fields: [ 'key', 'value', 'pending', 'delete' ], - idProperty: 'key' - }); - - Ext.define('pve-string-list', { - extend: 'Ext.data.Model', - fields: [ 'n', 't' ], - idProperty: 'n' - }); - - Ext.define('pve-tasks', { - extend: 'Ext.data.Model', - fields: [ - { name: 'starttime', type : 'date', dateFormat: 'timestamp' }, - { name: 'endtime', type : 'date', dateFormat: 'timestamp' }, - { name: 'pid', type: 'int' }, - 'node', 'upid', 'user', 'status', 'type', 'id' - ], - idProperty: 'upid' - }); - - Ext.define('pve-cluster-log', { - extend: 'Ext.data.Model', - fields: [ - { name: 'uid' , type: 'int' }, - { name: 'time', type : 'date', dateFormat: 'timestamp' }, - { name: 'pri', type: 'int' }, - { name: 'pid', type: 'int' }, - 'node', 'user', 'tag', 'msg', 'id' - ], - idProperty: 'id' - }); -}); diff --git a/www/manager6/data/ResourceStore.js b/www/manager6/data/ResourceStore.js index 789b8095..0a36dee2 100644 --- a/www/manager6/data/ResourceStore.js +++ b/www/manager6/data/ResourceStore.js @@ -268,7 +268,7 @@ Ext.define('PVE.data.ResourceStore', { extend: "Ext.data.Model", fields: fields, proxy: { - type: 'pve', + type: 'proxmox', url: '/api2/json/cluster/resources' } }); diff --git a/www/manager6/data/model/Realm.js b/www/manager6/data/model/Realm.js new file mode 100644 index 00000000..f4987daa --- /dev/null +++ b/www/manager6/data/model/Realm.js @@ -0,0 +1,29 @@ +Ext.define('pve-domains', { + extend: "Ext.data.Model", + fields: [ + 'realm', 'type', 'comment', 'default', 'tfa', + { + name: 'descr', + // Note: We use this in the RealmComboBox.js (see Bug #125) + convert: function(value, record) { + if (value) { + return value; + } + + var info = record.data; + // return realm if there is no comment + var text = info.comment || info.realm; + + if (info.tfa) { + text += " (+ " + info.tfa + ")"; + } + + return Ext.String.htmlEncode(text); + } + } + ], + proxy: { + type: 'proxmox', + url: "/api2/json/access/domains" + } +}); diff --git a/www/manager6/dc/ACLView.js b/www/manager6/dc/ACLView.js index a9ad7a64..338b4c53 100644 --- a/www/manager6/dc/ACLView.js +++ b/www/manager6/dc/ACLView.js @@ -87,7 +87,7 @@ Ext.define('PVE.dc.ACLView', { var store = Ext.create('Ext.data.Store',{ model: 'pve-acl', proxy: { - type: 'pve', + type: 'proxmox', url: "/api2/json/access/acl" }, sorters: { diff --git a/www/manager6/dc/Backup.js b/www/manager6/dc/Backup.js index 3183e5ef..92337852 100644 --- a/www/manager6/dc/Backup.js +++ b/www/manager6/dc/Backup.js @@ -331,7 +331,7 @@ Ext.define('PVE.dc.BackupView', { var store = new Ext.data.Store({ model: 'pve-cluster-backup', proxy: { - type: 'pve', + type: 'proxmox', url: "/api2/json/cluster/backup" } }); diff --git a/www/manager6/dc/Health.js b/www/manager6/dc/Health.js index e6b405e5..3c7f17b5 100644 --- a/www/manager6/dc/Health.js +++ b/www/manager6/dc/Health.js @@ -171,7 +171,7 @@ Ext.define('PVE.dc.Health', { interval: 3000, storeid: 'pve-cluster-ceph', proxy: { - type: 'pve', + type: 'proxmox', url: '/api2/json/nodes/localhost/ceph/status' } }); diff --git a/www/manager6/dc/Log.js b/www/manager6/dc/Log.js index 0bd7623d..0106af99 100644 --- a/www/manager6/dc/Log.js +++ b/www/manager6/dc/Log.js @@ -12,9 +12,9 @@ Ext.define('PVE.dc.Log', { var logstore = Ext.create('Proxmox.data.UpdateStore', { storeid: 'pve-cluster-log', - model: 'pve-cluster-log', + model: 'proxmox-cluster-log', proxy: { - type: 'pve', + type: 'proxmox', url: '/api2/json/cluster/log' } }); diff --git a/www/manager6/dc/SecurityGroups.js b/www/manager6/dc/SecurityGroups.js index dd5eafe9..6e47cdc2 100644 --- a/www/manager6/dc/SecurityGroups.js +++ b/www/manager6/dc/SecurityGroups.js @@ -95,7 +95,7 @@ Ext.define('PVE.SecurityGroupList', { var store = new Ext.data.Store({ model: 'pve-security-groups', proxy: { - type: 'pve', + type: 'proxmox', url: '/api2/json' + me.base_url }, sorters: { diff --git a/www/manager6/dc/StorageView.js b/www/manager6/dc/StorageView.js index 9e0e07e1..f09733a5 100644 --- a/www/manager6/dc/StorageView.js +++ b/www/manager6/dc/StorageView.js @@ -15,7 +15,7 @@ Ext.define('PVE.dc.StorageView', { var store = new Ext.data.Store({ model: 'pve-storage', proxy: { - type: 'pve', + type: 'proxmox', url: "/api2/json/storage" }, sorters: { diff --git a/www/manager6/dc/Summary.js b/www/manager6/dc/Summary.js index 0b226a1e..88c66b29 100644 --- a/www/manager6/dc/Summary.js +++ b/www/manager6/dc/Summary.js @@ -62,7 +62,7 @@ Ext.define('PVE.dc.Summary', { storeid: 'pve-cluster-status', model: 'pve-dc-nodes', proxy: { - type: 'pve', + type: 'proxmox', url: "/api2/json/cluster/status" } }); diff --git a/www/manager6/dc/Tasks.js b/www/manager6/dc/Tasks.js index 8b6f9141..e4d11d0d 100644 --- a/www/manager6/dc/Tasks.js +++ b/www/manager6/dc/Tasks.js @@ -12,9 +12,9 @@ Ext.define('PVE.dc.Tasks', { var taskstore = Ext.create('Proxmox.data.UpdateStore', { storeid: 'pve-cluster-tasks', - model: 'pve-tasks', + model: 'proxmox-tasks', proxy: { - type: 'pve', + type: 'proxmox', url: '/api2/json/cluster/tasks' } }); diff --git a/www/manager6/form/BridgeSelector.js b/www/manager6/form/BridgeSelector.js index 01a51a23..dc4a86d5 100644 --- a/www/manager6/form/BridgeSelector.js +++ b/www/manager6/form/BridgeSelector.js @@ -49,7 +49,7 @@ Ext.define('PVE.form.BridgeSelector', { me.nodename = nodename; me.store.setProxy({ - type: 'pve', + type: 'proxmox', url: '/api2/json/nodes/' + me.nodename + '/network?type=' + me.bridgeType }); diff --git a/www/manager6/form/CephPoolSelector.js b/www/manager6/form/CephPoolSelector.js index e66221d5..c53c7826 100644 --- a/www/manager6/form/CephPoolSelector.js +++ b/www/manager6/form/CephPoolSelector.js @@ -19,7 +19,7 @@ Ext.define('PVE.form.CephPoolSelector', { fields: ['name'], sorters: 'name', proxy: { - type: 'pve', + type: 'proxmox', url: '/api2/json/nodes/' + me.nodename + '/ceph/pools' } }); diff --git a/www/manager6/form/FileSelector.js b/www/manager6/form/FileSelector.js index 1f054b13..b07f6bbc 100644 --- a/www/manager6/form/FileSelector.js +++ b/www/manager6/form/FileSelector.js @@ -30,7 +30,7 @@ Ext.define('PVE.form.FileSelector', { } me.store.setProxy({ - type: 'pve', + type: 'proxmox', url: url }); diff --git a/www/manager6/form/GlobalSearchField.js b/www/manager6/form/GlobalSearchField.js index a2264d71..cac33f78 100644 --- a/www/manager6/form/GlobalSearchField.js +++ b/www/manager6/form/GlobalSearchField.js @@ -33,7 +33,7 @@ Ext.define('PVE.form.GlobalSearchField', { store: { model: 'PVEResources', proxy:{ - type: 'pve', + type: 'proxmox', url: '/api2/extjs/cluster/resources' } }, diff --git a/www/manager6/form/GroupSelector.js b/www/manager6/form/GroupSelector.js index 4aba4d65..e7c674ff 100644 --- a/www/manager6/form/GroupSelector.js +++ b/www/manager6/form/GroupSelector.js @@ -49,7 +49,7 @@ Ext.define('PVE.form.GroupSelector', { extend: 'Ext.data.Model', fields: [ 'groupid', 'comment' ], proxy: { - type: 'pve', + type: 'proxmox', url: "/api2/json/access/groups" }, idProperty: 'groupid' diff --git a/www/manager6/form/IPRefSelector.js b/www/manager6/form/IPRefSelector.js index bb7cb5b8..8ca74bdf 100644 --- a/www/manager6/form/IPRefSelector.js +++ b/www/manager6/form/IPRefSelector.js @@ -28,7 +28,7 @@ Ext.define('PVE.form.IPRefSelector', { fields: [ 'type', 'name', 'ref', 'comment' ], idProperty: 'ref', proxy: { - type: 'pve', + type: 'proxmox', url: url }, sorters: { diff --git a/www/manager6/form/NodeSelector.js b/www/manager6/form/NodeSelector.js index 386593b6..3cd7835f 100644 --- a/www/manager6/form/NodeSelector.js +++ b/www/manager6/form/NodeSelector.js @@ -21,7 +21,7 @@ Ext.define('PVE.form.NodeSelector', { store: { fields: [ 'node', 'cpu', 'maxcpu', 'mem', 'maxmem', 'uptime' ], proxy: { - type: 'pve', + type: 'proxmox', url: '/api2/json/nodes' }, sorters: [ diff --git a/www/manager6/form/PoolSelector.js b/www/manager6/form/PoolSelector.js index fea56b8e..80a42b40 100644 --- a/www/manager6/form/PoolSelector.js +++ b/www/manager6/form/PoolSelector.js @@ -47,7 +47,7 @@ Ext.define('PVE.form.PoolSelector', { extend: 'Ext.data.Model', fields: [ 'poolid', 'comment' ], proxy: { - type: 'pve', + type: 'proxmox', url: "/api2/json/pools" }, idProperty: 'poolid' diff --git a/www/manager6/form/RoleSelector.js b/www/manager6/form/RoleSelector.js index ba91b24c..04b5b538 100644 --- a/www/manager6/form/RoleSelector.js +++ b/www/manager6/form/RoleSelector.js @@ -41,7 +41,7 @@ Ext.define('PVE.form.RoleSelector', { extend: 'Ext.data.Model', fields: [ 'roleid', 'privs' ], proxy: { - type: 'pve', + type: 'proxmox', url: "/api2/json/access/roles" }, idProperty: 'roleid' diff --git a/www/manager6/form/SecurityGroupSelector.js b/www/manager6/form/SecurityGroupSelector.js index 8f946af7..4c7cd6f3 100644 --- a/www/manager6/form/SecurityGroupSelector.js +++ b/www/manager6/form/SecurityGroupSelector.js @@ -12,7 +12,7 @@ Ext.define('PVE.form.SecurityGroupsSelector', { fields: [ 'group', 'comment' ], idProperty: 'group', proxy: { - type: 'pve', + type: 'proxmox', url: "/api2/json/cluster/firewall/groups" }, sorters: { diff --git a/www/manager6/form/SnapshotSelector.js b/www/manager6/form/SnapshotSelector.js index 8ccec0dd..1ed420ab 100644 --- a/www/manager6/form/SnapshotSelector.js +++ b/www/manager6/form/SnapshotSelector.js @@ -21,7 +21,7 @@ Ext.define('PVE.form.SnapshotSelector', { me.vmid = vmid; me.store.setProxy({ - type: 'pve', + type: 'proxmox', url: '/api2/json/nodes/' + me.nodename + '/qemu/' + me.vmid +'/snapshot' }); diff --git a/www/manager6/form/StorageSelector.js b/www/manager6/form/StorageSelector.js index a4b9913a..cdd60527 100644 --- a/www/manager6/form/StorageSelector.js +++ b/www/manager6/form/StorageSelector.js @@ -51,7 +51,7 @@ Ext.define('PVE.form.StorageSelector', { params.enabled = 1; // skip disabled storages } me.store.setProxy({ - type: 'pve', + type: 'proxmox', url: url, extraParams: params }); diff --git a/www/manager6/form/USBSelector.js b/www/manager6/form/USBSelector.js index a8a8da52..ed35bde0 100644 --- a/www/manager6/form/USBSelector.js +++ b/www/manager6/form/USBSelector.js @@ -43,7 +43,7 @@ Ext.define('PVE.form.USBSelector', { var store = new Ext.data.Store({ model: 'pve-usb-' + me.type, proxy: { - type: 'pve', + type: 'proxmox', url: "/api2/json/nodes/" + nodename + "/scan/usb" }, filters: [ diff --git a/www/manager6/form/UserSelector.js b/www/manager6/form/UserSelector.js index ef95d899..3d34d962 100644 --- a/www/manager6/form/UserSelector.js +++ b/www/manager6/form/UserSelector.js @@ -65,7 +65,7 @@ Ext.define('PVE.form.UserSelector', { { type: 'date', dateFormat: 'timestamp', name: 'expire' } ], proxy: { - type: 'pve', + type: 'proxmox', url: "/api2/json/access/users" }, idProperty: 'userid' diff --git a/www/manager6/grid/BackupView.js b/www/manager6/grid/BackupView.js index 8487c87d..1a5bc209 100644 --- a/www/manager6/grid/BackupView.js +++ b/www/manager6/grid/BackupView.js @@ -75,7 +75,7 @@ Ext.define('PVE.grid.BackupView', { url += '?content=backup'; me.store.setProxy({ - type: 'pve', + type: 'proxmox', url: url }); diff --git a/www/manager6/grid/FirewallAliases.js b/www/manager6/grid/FirewallAliases.js index bb38fd26..46bbced6 100644 --- a/www/manager6/grid/FirewallAliases.js +++ b/www/manager6/grid/FirewallAliases.js @@ -95,7 +95,7 @@ Ext.define('PVE.FirewallAliases', { var store = new Ext.data.Store({ model: 'pve-fw-aliases', proxy: { - type: 'pve', + type: 'proxmox', url: "/api2/json" + me.base_url }, sorters: { diff --git a/www/manager6/grid/FirewallRules.js b/www/manager6/grid/FirewallRules.js index 4b899917..55585ee3 100644 --- a/www/manager6/grid/FirewallRules.js +++ b/www/manager6/grid/FirewallRules.js @@ -29,7 +29,7 @@ Ext.define('PVE.form.FWMacroSelector', { fields: [ 'macro', 'descr' ], idProperty: 'macro', proxy: { - type: 'pve', + type: 'proxmox', url: "/api2/json/cluster/firewall/macros" }, sorters: { @@ -413,7 +413,7 @@ Ext.define('PVE.FirewallRules', { me.groupBtn.setDisabled(false); } me.store.setProxy({ - type: 'pve', + type: 'proxmox', url: '/api2/json' + url }); diff --git a/www/manager6/grid/PoolMembers.js b/www/manager6/grid/PoolMembers.js index 680e2731..a452cc59 100644 --- a/www/manager6/grid/PoolMembers.js +++ b/www/manager6/grid/PoolMembers.js @@ -156,7 +156,7 @@ Ext.define('PVE.grid.PoolMembers', { } ], proxy: { - type: 'pve', + type: 'proxmox', root: 'data.members', url: "/api2/json/pools/" + me.pool } diff --git a/www/manager6/grid/Replication.js b/www/manager6/grid/Replication.js index b8f303c7..d19e74fd 100644 --- a/www/manager6/grid/Replication.js +++ b/www/manager6/grid/Replication.js @@ -436,7 +436,7 @@ Ext.define('PVE.grid.ReplicaView', { model: (mode === 'dc')? 'pve-replication' : 'pve-replication-state', interval: 3000, proxy: { - type: 'pve', + type: 'proxmox', url: "/api2/json" + url } }); diff --git a/www/manager6/ha/GroupSelector.js b/www/manager6/ha/GroupSelector.js index 3c2f23d8..f7a12772 100644 --- a/www/manager6/ha/GroupSelector.js +++ b/www/manager6/ha/GroupSelector.js @@ -58,7 +58,7 @@ Ext.define('PVE.ha.GroupSelector', { } ], proxy: { - type: 'pve', + type: 'proxmox', url: "/api2/json/cluster/ha/groups" }, idProperty: 'group' diff --git a/www/manager6/ha/Status.js b/www/manager6/ha/Status.js index 915c26e3..c166d682 100644 --- a/www/manager6/ha/Status.js +++ b/www/manager6/ha/Status.js @@ -15,7 +15,7 @@ Ext.define('PVE.ha.Status', { storeid: 'pve-store-' + (++Ext.idSeed), groupField: 'type', proxy: { - type: 'pve', + type: 'proxmox', url: '/api2/json/cluster/ha/status/current' } }); diff --git a/www/manager6/node/Disks.js b/www/manager6/node/Disks.js index 8e79dc84..c2b46b19 100644 --- a/www/manager6/node/Disks.js +++ b/www/manager6/node/Disks.js @@ -142,7 +142,7 @@ Ext.define('PVE.node.DiskList', { storeid: 'node-disk-list' + nodename, model: 'node-disk-list', proxy: { - type: 'pve', + type: 'proxmox', url: "/api2/json/nodes/" + nodename + "/disks/list" }, sorters: [ @@ -337,7 +337,7 @@ Ext.define('PVE.DiskSmartWindow', { me.store = Ext.create('Ext.data.Store', { model: 'disk-smart', proxy: { - type: 'pve', + type: 'proxmox', url: "/api2/json/nodes/" + nodename + "/disks/smart?disk=" + dev } }); diff --git a/www/manager6/panel/IPSet.js b/www/manager6/panel/IPSet.js index 9af60e12..47c08d77 100644 --- a/www/manager6/panel/IPSet.js +++ b/www/manager6/panel/IPSet.js @@ -34,7 +34,7 @@ Ext.define('PVE.IPSetList', { var store = new Ext.data.Store({ model: 'pve-fw-ipsets', proxy: { - type: 'pve', + type: 'proxmox', url: "/api2/json" + me.base_url }, sorters: { @@ -274,7 +274,7 @@ Ext.define('PVE.IPSetGrid', { me.addBtn.setDisabled(false); me.removeBtn.baseurl = url + '/'; me.store.setProxy({ - type: 'pve', + type: 'proxmox', url: '/api2/json' + url }); diff --git a/www/manager6/storage/ContentView.js b/www/manager6/storage/ContentView.js index a7e519ac..0661065d 100644 --- a/www/manager6/storage/ContentView.js +++ b/www/manager6/storage/ContentView.js @@ -20,7 +20,7 @@ Ext.define('PVE.grid.TemplateSelector', { model: 'pve-aplinfo', groupField: 'section', proxy: { - type: 'pve', + type: 'proxmox', url: '/api2/json' + baseurl } }); @@ -355,7 +355,7 @@ Ext.define('PVE.storage.ContentView', { model: 'pve-storage-content', groupField: 'content', proxy: { - type: 'pve', + type: 'proxmox', url: '/api2/json' + baseurl }, sorters: { diff --git a/www/manager6/storage/GlusterFsEdit.js b/www/manager6/storage/GlusterFsEdit.js index c6938631..5b2e02bf 100644 --- a/www/manager6/storage/GlusterFsEdit.js +++ b/www/manager6/storage/GlusterFsEdit.js @@ -42,7 +42,7 @@ Ext.define('PVE.storage.GlusterFsScan', { var store = Ext.create('Ext.data.Store', { fields: [ 'volname' ], proxy: { - type: 'pve', + type: 'proxmox', url: '/api2/json/nodes/' + me.nodename + '/scan/glusterfs' } }); diff --git a/www/manager6/storage/IScsiEdit.js b/www/manager6/storage/IScsiEdit.js index 625788bd..1cc22353 100644 --- a/www/manager6/storage/IScsiEdit.js +++ b/www/manager6/storage/IScsiEdit.js @@ -41,7 +41,7 @@ Ext.define('PVE.storage.IScsiScan', { var store = Ext.create('Ext.data.Store', { fields: [ 'target', 'portal' ], proxy: { - type: 'pve', + type: 'proxmox', url: '/api2/json/nodes/' + me.nodename + '/scan/iscsi' } }); diff --git a/www/manager6/storage/LVMEdit.js b/www/manager6/storage/LVMEdit.js index d307624d..b1246738 100644 --- a/www/manager6/storage/LVMEdit.js +++ b/www/manager6/storage/LVMEdit.js @@ -16,7 +16,7 @@ Ext.define('PVE.storage.VgSelector', { autoLoad: {}, // true, fields: [ 'vg', 'size', 'free' ], proxy: { - type: 'pve', + type: 'proxmox', url: '/api2/json/nodes/' + me.nodename + '/scan/lvm' } }); @@ -66,7 +66,7 @@ Ext.define('PVE.storage.BaseStorageSelector', { } }], proxy: { - type: 'pve', + type: 'proxmox', url: '/api2/json/storage/' } }); diff --git a/www/manager6/storage/LvmThinEdit.js b/www/manager6/storage/LvmThinEdit.js index 406be334..5379fb83 100644 --- a/www/manager6/storage/LvmThinEdit.js +++ b/www/manager6/storage/LvmThinEdit.js @@ -38,7 +38,7 @@ Ext.define('PVE.storage.TPoolSelector', { var store = Ext.create('Ext.data.Store', { fields: [ 'lv' ], proxy: { - type: 'pve', + type: 'proxmox', url: '/api2/json/nodes/' + me.nodename + '/scan/lvmthin' } }); @@ -75,7 +75,7 @@ Ext.define('PVE.storage.BaseVGSelector', { autoLoad: {}, fields: [ 'vg', 'size', 'free'], proxy: { - type: 'pve', + type: 'proxmox', url: '/api2/json/nodes/' + me.nodename + '/scan/lvm' } }); diff --git a/www/manager6/storage/NFSEdit.js b/www/manager6/storage/NFSEdit.js index 2bd6d943..63a5fb8d 100644 --- a/www/manager6/storage/NFSEdit.js +++ b/www/manager6/storage/NFSEdit.js @@ -42,7 +42,7 @@ Ext.define('PVE.storage.NFSScan', { var store = Ext.create('Ext.data.Store', { fields: [ 'path', 'options' ], proxy: { - type: 'pve', + type: 'proxmox', url: '/api2/json/nodes/' + me.nodename + '/scan/nfs' } }); diff --git a/www/manager6/storage/ZFSPoolEdit.js b/www/manager6/storage/ZFSPoolEdit.js index bbc478ba..5974ecfa 100644 --- a/www/manager6/storage/ZFSPoolEdit.js +++ b/www/manager6/storage/ZFSPoolEdit.js @@ -19,7 +19,7 @@ Ext.define('PVE.storage.ZFSPoolSelector', { autoLoad: {}, // true, fields: [ 'pool', 'size', 'free' ], proxy: { - type: 'pve', + type: 'proxmox', url: '/api2/json/nodes/' + me.nodename + '/scan/zfs' } }); -- 2.39.2