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 <t.lamprecht@proxmox.com>
Reviewed-by: Dominik Csapak <d.csapak@proxmox.com>

diff --git a/www/manager6/Makefile b/www/manager6/Makefile
index 1d0d8a72d1a54f763b71c669e29e113446151e99..39ccc346a624d14a7e0781a4721aa51de4b3354e 100644 (file)
--- 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 d588441a72eaac2d51ba8c0e372610bc9744f05a..8093ed0ac334215bd197fcda95dbe69fc284fa9f 100644 (file)
--- 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 24d984962f9c8e761dfbe58d31c43c0c6e0c9a7b..684c7f3020d5015f5723b87b64703c3dd3b8dd41 100644 (file)
--- 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 58af5cbf2528104d67d949d96989bc81c6b2c0f1..ed453b42eba4f23ed0b2bf126d0cf32d954c9c2b 100644 (file)
--- 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 d52e7311c0466a8f9173bda99bc657e1cf193c17..02abb81f73037e9eb8fc71f7f7291ba216b87592 100644 (file)
--- 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 (file)
index f8f918f..0000000
--- 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 789b8095fb53d38a836d94c8b8099dd7bbe0304d..0a36dee23a322b1985f56a2a436aa87e759a302f 100644 (file)
--- 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 (file)
index 0000000..f4987da
--- /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 a9ad7a64813f7b25d287ed64be724eb39058c96e..338b4c53a0ba4994bcf19f4beb0f9d1605c7d1f4 100644 (file)
--- 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 3183e5ef0153225089ac149e8971e66a83cbd758..92337852afb075070927412d5af8ad0392a349af 100644 (file)
--- 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 e6b405e569fb42cbda481c18eaa4bb56753e4a4c..3c7f17b5b8553f6a59a5c7aa1887bbae77ef5878 100644 (file)
--- 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 0bd7623d54817ef302edd7e27f71b6d282caf119..0106af9913ed999f78d84913f4e6cd8fd1a7e8b0 100644 (file)
--- 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 dd5eafe9fe877a71731f21f9d26c32ba4d596e2d..6e47cdc2452bc3c29a9554e5436e34f46cbd20df 100644 (file)
--- 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 9e0e07e1954a6550004fc1996977daff4a55d55d..f09733a50be1523ecba4ff97a9c150854957ad35 100644 (file)
--- 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 0b226a1e0d6336e86d46f4856c702c28d920396b..88c66b2900b5c67e9be87ca7c577341a01b70852 100644 (file)
--- 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 8b6f9141352beb7340a735091cdeaafe8ba051f8..e4d11d0dc5892604190a2ef0f8248fdf761098c4 100644 (file)
--- 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 01a51a2320509e2d5ca692ee9fe5e768ffd82045..dc4a86d5b011b823f446368b063e809deecab7fc 100644 (file)
--- 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 e66221d50550ef9813a00b64ab088c9d1c47aea9..c53c782666b0c7c629d8646e52c052b6bc0b8eb6 100644 (file)
--- 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 1f054b13d08329f2f15e200f154e2947b70d5360..b07f6bbca0ce527b5b02cd280e1ed7f565b11ba3 100644 (file)
--- 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 a2264d71536e54ecbd265231d5788e673f933245..cac33f78add69905e1b67168c3ab741a38e04cb2 100644 (file)
--- 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 4aba4d654b25d90fd2ebd7c74fbc1eea209e2ecd..e7c674ff51b3190e5ee4ced6b546550ccbc03e3f 100644 (file)
--- 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 bb7cb5b8b9ff58710a08126eae6bb9a19917a0eb..8ca74bdfc7f731fbe9cc4d633058d9359e75bcad 100644 (file)
--- 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 386593b6a0ceb883df539f32a2ebbb1884c8a879..3cd7835f42074a1e18b059d60d4337708263c98a 100644 (file)
--- 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 fea56b8ec7ee0a767b30db5099f53c0f0f929ce1..80a42b4059c961b736983b261f087b166d362203 100644 (file)
--- 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 ba91b24c55c2f6ea0aab9a7042cf737f952bac38..04b5b538aab5ac941ef4e67f1db2a23cc2a28e9e 100644 (file)
--- 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 8f946af7dcfb4b0b44d939f830339b636b5b75d5..4c7cd6f37f59ac4f84e6bb28b1b06d6a5513abdb 100644 (file)
--- 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 8ccec0dde1dee9c975c5d82bdf42d90562e19815..1ed420ab33f0538a2c9c06ba75a4993ae2938735 100644 (file)
--- 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 a4b9913a02db13853bc12ddbc4ab78bc8cdbea54..cdd605279160a1f0c7ea025217a7b483dc523d6e 100644 (file)
--- 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 a8a8da52696d93fb12ec5bc91b813f30d21546ab..ed35bde0df937980db239f5db488b6a541e8569f 100644 (file)
--- 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 ef95d899e911526477854421878d02390d3e7534..3d34d962eb11e7c07c14d1f277b69d56b2cf3c1a 100644 (file)
--- 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 8487c87d12afc9c38493a03ad15f5017e9a50ad7..1a5bc20959a97bfb97d0ee66e2b6f1d4fa2f4c52 100644 (file)
--- 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 bb38fd2638ab89a169d266c4ebc9999667ff23db..46bbced6477e57efb4a8445fa227de63c00b34fd 100644 (file)
--- 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 4b899917f433495da4e1802db2674886fa665ea4..55585ee3fbe713f62ecf0a3ea13f576952d04eae 100644 (file)
--- 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 680e27318e3b0ff8f3318204ff200707c90f7877..a452cc592b7a3749f0600ddd1c4354d1a86a2ee3 100644 (file)
--- 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 b8f303c7578a68df25827b651e02befbaaaac871..d19e74fd5606b38390cc7142c9601db550a8110c 100644 (file)
--- 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 3c2f23d87101f3473c36ea035c00b25febeb67f4..f7a12772ed6f3481e55a71ede386f01270f30e72 100644 (file)
--- 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 915c26e397be265ecad53441dd713359a3231bc9..c166d68232293a1c6e55557adbaf06e116231dca 100644 (file)
--- 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 8e79dc8420d773c360ae66324bcf1d744f9f8642..c2b46b19bbb4c9483d071e62eeff1eacfeb85070 100644 (file)
--- 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 9af60e12676912697c9f7dab47ccf65cbd62fd73..47c08d77a5b4427b6476c53ad24759ed0df5b47d 100644 (file)
--- 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 a7e519ac505e3d20fa6c1740db5833be7cc5bdc2..0661065d72c6d1d05543e8f6beb3e9e256fa31a4 100644 (file)
--- 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 c69386312bb3ce7956b9257405e24fea88b3170a..5b2e02bfd89211908ab628830c5cb27e878299f3 100644 (file)
--- 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 625788bdd252941db2e8704e2ca7bb77dbc3d331..1cc22353d230cf87fad64d620dbdbb0015a66202 100644 (file)
--- 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 d307624d2a6163c76dc54c43df1c2be1a4f9107e..b1246738afd0db0ad410e4bd95ae0b6d05e384b0 100644 (file)
--- 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 406be33482eba054e0a88f4c94aa8fa86e6e39e0..5379fb837a0bc330cd35f2f4a823b24a16b3d219 100644 (file)
--- 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 2bd6d94362346e7012aa84d925e952e940435019..63a5fb8d10e38f051c7c89f00ca76e82a9eca8cb 100644 (file)
--- 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 bbc478babd4e27ef3c3d4eae07759b4d05f5d7bb..5974ecfa36e35781e89fa290e7d8761837ce4be9 100644 (file)
--- 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'
            }
        });