Commit 08ec5ef6 authored by Alen Grizonic's avatar Alen Grizonic Committed by Dietmar Maurer

bug #659 (pool support) fix

lxc added to additional GUI pool functions (also for ExtJS5)
Signed-off-by: 's avatarAlen Grizonic <a.grizonic@proxmox.com>
parent 191ec7ac
...@@ -26,7 +26,7 @@ Ext.define('PVE.form.ViewSelector', { ...@@ -26,7 +26,7 @@ Ext.define('PVE.form.ViewSelector', {
groups: ['pool'], groups: ['pool'],
// Pool View only lists VMs and Containers // Pool View only lists VMs and Containers
filterfn: function(node) { 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'; node.data.type === 'pool';
} }
} }
...@@ -98,4 +98,4 @@ Ext.define('PVE.form.ViewSelector', { ...@@ -98,4 +98,4 @@ Ext.define('PVE.form.ViewSelector', {
me.mon(sp, 'statechange', statechange, me); me.mon(sp, 'statechange', statechange, me);
} }
}); });
\ No newline at end of file
...@@ -115,7 +115,7 @@ Ext.define('PVE.grid.PoolMembers', { ...@@ -115,7 +115,7 @@ Ext.define('PVE.grid.PoolMembers', {
var params = { 'delete': 1 }; var params = { 'delete': 1 };
if (rec.data.type === 'storage') { if (rec.data.type === 'storage') {
params.storage = rec.data.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; params.vms = rec.data.vmid;
} else { } else {
throw "unknown resource type"; throw "unknown resource type";
...@@ -178,4 +178,4 @@ Ext.define('PVE.grid.PoolMembers', { ...@@ -178,4 +178,4 @@ Ext.define('PVE.grid.PoolMembers', {
me.callParent(); me.callParent();
} }
}); });
\ No newline at end of file
...@@ -29,7 +29,7 @@ Ext.define('PVE.form.ViewSelector', { ...@@ -29,7 +29,7 @@ Ext.define('PVE.form.ViewSelector', {
groups: ['pool'], groups: ['pool'],
// Pool View only lists VMs and Containers // Pool View only lists VMs and Containers
filterfn: function(node) { 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'; node.data.type === 'pool';
} }
} }
...@@ -99,4 +99,4 @@ Ext.define('PVE.form.ViewSelector', { ...@@ -99,4 +99,4 @@ Ext.define('PVE.form.ViewSelector', {
me.mon(sp, 'statechange', statechange, me); me.mon(sp, 'statechange', statechange, me);
} }
}); });
\ No newline at end of file
...@@ -115,7 +115,7 @@ Ext.define('PVE.grid.PoolMembers', { ...@@ -115,7 +115,7 @@ Ext.define('PVE.grid.PoolMembers', {
var params = { 'delete': 1 }; var params = { 'delete': 1 };
if (rec.data.type === 'storage') { if (rec.data.type === 'storage') {
params.storage = rec.data.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; params.vms = rec.data.vmid;
} else { } else {
throw "unknown resource type"; throw "unknown resource type";
...@@ -178,4 +178,4 @@ Ext.define('PVE.grid.PoolMembers', { ...@@ -178,4 +178,4 @@ Ext.define('PVE.grid.PoolMembers', {
me.callParent(); me.callParent();
} }
}); });
\ No newline at end of file
...@@ -23,7 +23,7 @@ Ext.define('PVE.window.Restore', { ...@@ -23,7 +23,7 @@ Ext.define('PVE.window.Restore', {
name: 'storage', name: 'storage',
value: '', value: '',
fieldLabel: gettext('Storage'), fieldLabel: gettext('Storage'),
storageContent: (me.vmtype === 'openvz') ? 'rootdir' : 'images', storageContent: (me.vmtype === 'lxc') ? 'rootdir' : 'images',
allowBlank: true allowBlank: true
}); });
...@@ -88,8 +88,8 @@ Ext.define('PVE.window.Restore', { ...@@ -88,8 +88,8 @@ Ext.define('PVE.window.Restore', {
}; };
var url; var url;
if (me.vmtype === 'openvz') { if (me.vmtype === 'lxc') {
url = '/nodes/' + me.nodename + '/openvz'; url = '/nodes/' + me.nodename + '/lxc';
params.ostemplate = me.volid; params.ostemplate = me.volid;
params.restore = 1; params.restore = 1;
} else if (me.vmtype === 'qemu') { } else if (me.vmtype === 'qemu') {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment