Proxmox/pve-manager
5
0
Fork 0
Code Pull Requests Releases Activity

fix create CT: this fix the create CT what happend in previous refactoring.

Browse Source
This commit is contained in:
Wolfgang Link 2015-10-23 15:33:19 +02:00 committed by Dietmar Maurer
parent b17776d999
commit a3c6e04455
4 changed files with 58 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog.Debian vendored
View File

@ -1,4 +1,4 @@
pve-manager (4.0-52) unstable; urgency=medium
pve-manager (4.0-53) unstable; urgency=medium
* fix bug #781: separate LXC CPU and memory in editor

2
defines.mk
View File

@ -2,7 +2,7 @@ RELEASE=4.0
VERSION=4.0
PACKAGE=pve-manager
PACKAGERELEASE=52
PACKAGERELEASE=53
BINDIR=${DESTDIR}/usr/bin
PERLLIBDIR=${DESTDIR}/usr/share/perl5

13
www/manager/lxc/CreateWizard.js
View File

@ -160,10 +160,21 @@ Ext.define('PVE.lxc.CreateWizard', {
]
},
{
xtype: 'pveLxcResourceInputPanel',
xtype: 'inputpanel',
title: gettext('Resources'),
items: [
{
xtype: 'pveLxcMemoryInputPanel',
title: gettext('Memory'),
insideWizard: true
},
{
xtype: 'pveLxcCPUInputPanel',
title: gettext('CPU'),
insideWizard: true
}
]
},
networkpanel,
{
xtype: 'pveLxcDNSInputPanel',

49
www/manager/lxc/ResourceEdit.js
View File

@ -1,8 +1,46 @@
var labelWidth = 120;
Ext.define('PVE.lxc.MemoryEdit', {
extend: 'PVE.window.Edit',
initComponent : function() {
var me = this;
Ext.apply(me, {
subject: gettext('Memory'),
items: Ext.create('PVE.lxc.MemoryInputPanel')
});
me.callParent();
me.load();
}
});
Ext.define('PVE.lxc.CPUEdit', {
extend: 'PVE.window.Edit',
initComponent : function() {
var me = this;
Ext.apply(me, {
subject: gettext('CPU'),
items: Ext.create('PVE.lxc.CPUInputPanel')
});
me.callParent();
me.load();
}
});
Ext.define('PVE.lxc.CPUInputPanel', {
extend: 'PVE.panel.InputPanel',
alias: 'widget.pveLxcCPUInputPanel',
insideWizard: false,
initComponent : function() {
var me = this;
@ -33,13 +71,14 @@ Ext.define('PVE.lxc.CPUEdit', {
});
me.callParent();
me.load();
}
});
Ext.define('PVE.lxc.MemoryEdit', {
extend: 'PVE.window.Edit',
Ext.define('PVE.lxc.MemoryInputPanel', {
extend: 'PVE.panel.InputPanel',
alias: 'widget.pveLxcMemoryInputPanel',
insideWizard: false,
initComponent : function() {
var me = this;
@ -73,7 +112,5 @@ Ext.define('PVE.lxc.MemoryEdit', {
});
me.callParent();
me.load();
}
});