[pve-devel] [PATCH v2 2/2] bug #659 (pool support) fix

Alen Grizonic a.grizonic at proxmox.com
Tue Jul 28 16:36:27 CEST 2015


lxc added to additional GUI pool functions (also for ExtJS5)

Signed-off-by: Alen Grizonic <a.grizonic at proxmox.com>
---
 www/manager/form/ViewSelector.js  | 4 ++--
 www/manager/grid/PoolMembers.js   | 4 ++--
 www/manager5/form/ViewSelector.js | 4 ++--
 www/manager5/grid/PoolMembers.js  | 4 ++--
 www/manager5/window/Restore.js    | 6 +++---
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/www/manager/form/ViewSelector.js b/www/manager/form/ViewSelector.js
index 4cb278f..4a8002f 100644
--- a/www/manager/form/ViewSelector.js
+++ b/www/manager/form/ViewSelector.js
@@ -26,7 +26,7 @@ Ext.define('PVE.form.ViewSelector', {
 		groups: ['pool'],
                 // Pool View only lists VMs and Containers
                 filterfn: function(node) {
-                    return node.data.type === 'qemu' || node.data.type === 'openvz' || 
+                    return node.data.type === 'qemu' || node.data.type === 'lxc' || node.data.type === 'openvz' || 
 			node.data.type === 'pool';
                 }
 	    }
@@ -98,4 +98,4 @@ Ext.define('PVE.form.ViewSelector', {
 
 	me.mon(sp, 'statechange', statechange, me);
     }
-});
\ No newline at end of file
+});
diff --git a/www/manager/grid/PoolMembers.js b/www/manager/grid/PoolMembers.js
index 939abde..932f475 100644
--- a/www/manager/grid/PoolMembers.js
+++ b/www/manager/grid/PoolMembers.js
@@ -115,7 +115,7 @@ Ext.define('PVE.grid.PoolMembers', {
 		var params = { 'delete': 1 };
 		if (rec.data.type === 'storage') {
 		    params.storage = rec.data.storage;
-		} else if (rec.data.type === 'qemu' || rec.data.type === 'openvz') {
+		} else if (rec.data.type === 'qemu' || rec.data.type === 'lxc' || rec.data.type === 'openvz') {
 		    params.vms = rec.data.vmid;
 		} else {
 		    throw "unknown resource type";
@@ -178,4 +178,4 @@ Ext.define('PVE.grid.PoolMembers', {
 
 	me.callParent();
     }
-});
\ No newline at end of file
+});
diff --git a/www/manager5/form/ViewSelector.js b/www/manager5/form/ViewSelector.js
index 74f4507..32181e2 100644
--- a/www/manager5/form/ViewSelector.js
+++ b/www/manager5/form/ViewSelector.js
@@ -29,7 +29,7 @@ Ext.define('PVE.form.ViewSelector', {
 		groups: ['pool'],
                 // Pool View only lists VMs and Containers
                 filterfn: function(node) {
-                    return node.data.type === 'qemu' || node.data.type === 'openvz' || 
+                    return node.data.type === 'qemu' || node.data.type === 'lxc' || node.data.type === 'openvz' || 
 			node.data.type === 'pool';
                 }
 	    }
@@ -99,4 +99,4 @@ Ext.define('PVE.form.ViewSelector', {
 
 	me.mon(sp, 'statechange', statechange, me);
     }
-});
\ No newline at end of file
+});
diff --git a/www/manager5/grid/PoolMembers.js b/www/manager5/grid/PoolMembers.js
index 939abde..932f475 100644
--- a/www/manager5/grid/PoolMembers.js
+++ b/www/manager5/grid/PoolMembers.js
@@ -115,7 +115,7 @@ Ext.define('PVE.grid.PoolMembers', {
 		var params = { 'delete': 1 };
 		if (rec.data.type === 'storage') {
 		    params.storage = rec.data.storage;
-		} else if (rec.data.type === 'qemu' || rec.data.type === 'openvz') {
+		} else if (rec.data.type === 'qemu' || rec.data.type === 'lxc' || rec.data.type === 'openvz') {
 		    params.vms = rec.data.vmid;
 		} else {
 		    throw "unknown resource type";
@@ -178,4 +178,4 @@ Ext.define('PVE.grid.PoolMembers', {
 
 	me.callParent();
     }
-});
\ No newline at end of file
+});
diff --git a/www/manager5/window/Restore.js b/www/manager5/window/Restore.js
index 9c37815..b862157 100644
--- a/www/manager5/window/Restore.js
+++ b/www/manager5/window/Restore.js
@@ -23,7 +23,7 @@ Ext.define('PVE.window.Restore', {
 	    name: 'storage',
 	    value: '',
 	    fieldLabel: gettext('Storage'),
-	    storageContent: (me.vmtype === 'openvz') ? 'rootdir' : 'images',
+	    storageContent: (me.vmtype === 'lxc') ? 'rootdir' : 'images',
 	    allowBlank: true
 	});
 
@@ -88,8 +88,8 @@ Ext.define('PVE.window.Restore', {
 		};
 
 		var url;
-		if (me.vmtype === 'openvz') {
-		    url = '/nodes/' + me.nodename + '/openvz';
+		if (me.vmtype === 'lxc') {
+		    url = '/nodes/' + me.nodename + '/lxc';
 		    params.ostemplate = me.volid;
 		    params.restore = 1;
 		} else if (me.vmtype === 'qemu') {
-- 
2.1.4




More information about the pve-devel mailing list