Split PVE specific models, which where not moved to the general
widget toolkit, in a separate file, data/Models.js
Signed-off-by: Thomas Lamprecht <t.lampre...@proxmox.com>
---
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/Models.js | 31 +++++++++
www/manager6/data/PVEProxy.js | 102 -----------------------------
www/manager6/data/RRDStore.js | 2 +-
www/manager6/data/ResourceStore.js | 2 +-
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/APT.js | 2 +-
www/manager6/node/Disks.js | 4 +-
www/manager6/node/NetworkView.js | 2 +-
www/manager6/node/ServiceView.js | 2 +-
www/manager6/node/Tasks.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 +-
51 files changed, 90 insertions(+), 161 deletions(-)
create mode 100644 www/manager6/data/Models.js
delete mode 100644 www/manager6/data/PVEProxy.js
diff --git a/www/manager6/Makefile b/www/manager6/Makefile
index 89b4667a..e8dbdf86 100644
--- a/www/manager6/Makefile
+++ b/www/manager6/Makefile
@@ -16,7 +16,7 @@ JSSRC=
\
lxc/CmdMenu.js \
node/CmdMenu.js \
VNCConsole.js \
- data/PVEProxy.js \
+ data/Models.js \
data/UpdateQueue.js \
data/UpdateStore.js \
data/ResourceStore.js \
diff --git a/www/manager6/ceph/Monitor.js b/www/manager6/ceph/Monitor.js
index 31d968cc..c4f091f9 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 4e333262..1bef7e0b 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 6b844e89..4f6ac277 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 cda97867..d83b1cdb 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/Models.js b/www/manager6/data/Models.js
new file mode 100644
index 00000000..efca8561
--- /dev/null
+++ b/www/manager6/data/Models.js
@@ -0,0 +1,31 @@
+// PVE specific models
+
+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/data/PVEProxy.js b/www/manager6/data/PVEProxy.js
deleted file mode 100644
index a3b0b721..00000000
--- a/www/manager6/data/PVEProxy.js
+++ /dev/null
@@ -1,102 +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);
- }
- }
- ],
- 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/RRDStore.js b/www/manager6/data/RRDStore.js
index 3caf0f4d..bd20544d 100644
--- a/www/manager6/data/RRDStore.js
+++ b/www/manager6/data/RRDStore.js
@@ -20,7 +20,7 @@ Ext.define('PVE.data.RRDStore', {
},
proxy: {
- type: 'pve'
+ type: 'proxmox'
},
fields: [
// node rrd fields
diff --git a/www/manager6/data/ResourceStore.js
b/www/manager6/data/ResourceStore.js
index ccf085e3..c8fbc30e 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/dc/ACLView.js b/www/manager6/dc/ACLView.js
index 9ea11a5d..6ab6e93c 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 720bc37f..1622d6b7 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 3e336a1b..e79f9f9b 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 ccd1834e..cdb63de7 100644
--- a/www/manager6/dc/Log.js
+++ b/www/manager6/dc/Log.js
@@ -12,9 +12,9 @@ Ext.define('PVE.dc.Log', {
var logstore = new PVE.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 2b171903..54066b5a 100644
--- a/www/manager6/dc/SecurityGroups.js
+++ b/www/manager6/dc/SecurityGroups.js
@@ -88,7 +88,7 @@ Ext.define('PVE.SecurityGroupList', {
var store = new Ext.data.Store({
fields: [ 'group', 'comment', 'digest' ],
proxy: {
- type: 'pve',
+ type: 'proxmox',
url: '/api2/json' + me.base_url
},
idProperty: 'group',
diff --git a/www/manager6/dc/StorageView.js b/www/manager6/dc/StorageView.js
index 8f5a055c..b1d377ee 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 1b9473af..310bd267 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 10f14df5..72b51a02 100644
--- a/www/manager6/dc/Tasks.js
+++ b/www/manager6/dc/Tasks.js
@@ -12,9 +12,9 @@ Ext.define('PVE.dc.Tasks', {
var taskstore = new PVE.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 bd07c206..ae7fbba7 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 fefe8470..259d5ccd 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 b28ce997..1ba30f60 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 2db8e5af..f0ad2e80 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 728f5f7e..2191836a 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 6fcced37..7c53fee3 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 4e7b2f3f..e6b617af 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 acef5f90..aaf83f62 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 b805c291..e78caa23 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 ea7d460e..9a189695 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 184869d1..f7387ad6 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 bc09b8d6..dd0534b0 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 c131b224..6cdb03c2 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 15ae85db..7d5cbf31 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 0a187c2f..c7e52594 100644
--- a/www/manager6/grid/FirewallAliases.js
+++ b/www/manager6/grid/FirewallAliases.js
@@ -88,7 +88,7 @@ Ext.define('PVE.FirewallAliases', {
var store = new Ext.data.Store({
fields: [ 'name', 'cidr', 'comment', 'digest' ],
proxy: {
- type: 'pve',
+ type: 'proxmox',
url: "/api2/json" + me.base_url
},
idProperty: 'name',
diff --git a/www/manager6/grid/FirewallRules.js
b/www/manager6/grid/FirewallRules.js
index 716f5218..c1da2e6e 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: {
@@ -412,7 +412,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 47d326f7..0ea18840 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 9b08f187..1998e28b 100644
--- a/www/manager6/grid/Replication.js
+++ b/www/manager6/grid/Replication.js
@@ -453,7 +453,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 74877398..7394372e 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/APT.js b/www/manager6/node/APT.js
index e8985403..1ed432ed 100644
--- a/www/manager6/node/APT.js
+++ b/www/manager6/node/APT.js
@@ -17,7 +17,7 @@ Ext.define('PVE.node.APT', {
model: 'apt-pkglist',
groupField: 'Origin',
proxy: {
- type: 'pve',
+ type: 'proxmox',
url: "/api2/json/nodes/" + nodename + "/apt/update"
},
sorters: [
diff --git a/www/manager6/node/Disks.js b/www/manager6/node/Disks.js
index e99065b0..863992c0 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/node/NetworkView.js b/www/manager6/node/NetworkView.js
index 848aa7b5..856d2f07 100644
--- a/www/manager6/node/NetworkView.js
+++ b/www/manager6/node/NetworkView.js
@@ -16,7 +16,7 @@ Ext.define('PVE.node.NetworkView', {
var store = Ext.create('Ext.data.Store', {
model: 'pve-networks',
proxy: {
- type: 'pve',
+ type: 'proxmox',
url: "/api2/json/nodes/" + nodename + "/network"
},
sorters: [
diff --git a/www/manager6/node/ServiceView.js b/www/manager6/node/ServiceView.js
index 6ccfff8b..b940befa 100644
--- a/www/manager6/node/ServiceView.js
+++ b/www/manager6/node/ServiceView.js
@@ -18,7 +18,7 @@ Ext.define('PVE.node.ServiceView', {
storeid: 'pve-services' + nodename,
model: 'pve-services',
proxy: {
- type: 'pve',
+ type: 'proxmox',
url: "/api2/json/nodes/" + nodename + "/services"
}
});
diff --git a/www/manager6/node/Tasks.js b/www/manager6/node/Tasks.js
index eb97d006..335ef233 100644
--- a/www/manager6/node/Tasks.js
+++ b/www/manager6/node/Tasks.js
@@ -20,9 +20,9 @@ Ext.define('PVE.node.Tasks', {
pageSize: 500,
autoLoad: true,
remoteFilter: true,
- model: 'pve-tasks',
+ model: 'proxmox-tasks',
proxy: {
- type: 'pve',
+ type: 'proxmox',
startParam: 'start',
limitParam: 'limit',
url: "/api2/json/nodes/" + nodename + "/tasks"
diff --git a/www/manager6/panel/IPSet.js b/www/manager6/panel/IPSet.js
index 72b39f62..81d280d1 100644
--- a/www/manager6/panel/IPSet.js
+++ b/www/manager6/panel/IPSet.js
@@ -28,7 +28,7 @@ Ext.define('PVE.IPSetList', {
var store = new Ext.data.Store({
fields: [ 'name', 'comment', 'digest' ],
proxy: {
- type: 'pve',
+ type: 'proxmox',
url: "/api2/json" + me.base_url
},
idProperty: 'name',
@@ -283,7 +283,7 @@ Ext.define('PVE.IPSetGrid', {
} else {
me.addBtn.setDisabled(false);
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 fb4e62f0..43ae836a 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 4a55f6a7..503a475b 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 77513d71..03c38f3b 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.11.0
_______________________________________________
pve-devel mailing list
pve-devel@pve.proxmox.com
https://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
