Commit a3c6e044 authored by Wolfgang Link's avatar Wolfgang Link Committed by Dietmar Maurer

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

parent b17776d9
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 * fix bug #781: separate LXC CPU and memory in editor
......
...@@ -2,7 +2,7 @@ RELEASE=4.0 ...@@ -2,7 +2,7 @@ RELEASE=4.0
VERSION=4.0 VERSION=4.0
PACKAGE=pve-manager PACKAGE=pve-manager
PACKAGERELEASE=52 PACKAGERELEASE=53
BINDIR=${DESTDIR}/usr/bin BINDIR=${DESTDIR}/usr/bin
PERLLIBDIR=${DESTDIR}/usr/share/perl5 PERLLIBDIR=${DESTDIR}/usr/share/perl5
......
...@@ -160,9 +160,20 @@ Ext.define('PVE.lxc.CreateWizard', { ...@@ -160,9 +160,20 @@ Ext.define('PVE.lxc.CreateWizard', {
] ]
}, },
{ {
xtype: 'pveLxcResourceInputPanel', xtype: 'inputpanel',
title: gettext('Resources'), title: gettext('Resources'),
insideWizard: true items: [
{
xtype: 'pveLxcMemoryInputPanel',
title: gettext('Memory'),
insideWizard: true
},
{
xtype: 'pveLxcCPUInputPanel',
title: gettext('CPU'),
insideWizard: true
}
]
}, },
networkpanel, networkpanel,
{ {
......
var labelWidth = 120; 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', { Ext.define('PVE.lxc.CPUEdit', {
extend: 'PVE.window.Edit', 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() { initComponent : function() {
var me = this; var me = this;
...@@ -33,13 +71,14 @@ Ext.define('PVE.lxc.CPUEdit', { ...@@ -33,13 +71,14 @@ Ext.define('PVE.lxc.CPUEdit', {
}); });
me.callParent(); me.callParent();
me.load();
} }
}); });
Ext.define('PVE.lxc.MemoryEdit', { Ext.define('PVE.lxc.MemoryInputPanel', {
extend: 'PVE.window.Edit', extend: 'PVE.panel.InputPanel',
alias: 'widget.pveLxcMemoryInputPanel',
insideWizard: false,
initComponent : function() { initComponent : function() {
var me = this; var me = this;
...@@ -73,7 +112,5 @@ Ext.define('PVE.lxc.MemoryEdit', { ...@@ -73,7 +112,5 @@ Ext.define('PVE.lxc.MemoryEdit', {
}); });
me.callParent(); me.callParent();
me.load();
} }
}); });
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