Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
pve-manager
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
pve-manager
Commits
a3c6e044
Commit
a3c6e044
authored
Oct 23, 2015
by
Wolfgang Link
Committed by
Dietmar Maurer
Oct 23, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix create CT: this fix the create CT what happend in previous refactoring.
parent
b17776d9
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
58 additions
and
10 deletions
+58
-10
changelog.Debian
debian/changelog.Debian
+1
-1
defines.mk
defines.mk
+1
-1
CreateWizard.js
www/manager/lxc/CreateWizard.js
+13
-2
ResourceEdit.js
www/manager/lxc/ResourceEdit.js
+43
-6
No files found.
debian/changelog.Debian
View file @
a3c6e044
pve-manager (4.0-5
2
) unstable; urgency=medium
pve-manager (4.0-5
3
) unstable; urgency=medium
* fix bug #781: separate LXC CPU and memory in editor
...
...
defines.mk
View file @
a3c6e044
...
...
@@ -2,7 +2,7 @@ RELEASE=4.0
VERSION=4.0
PACKAGE=pve-manager
PACKAGERELEASE=5
2
PACKAGERELEASE=5
3
BINDIR=${DESTDIR}/usr/bin
PERLLIBDIR=${DESTDIR}/usr/share/perl5
...
...
www/manager/lxc/CreateWizard.js
View file @
a3c6e044
...
...
@@ -160,9 +160,20 @@ Ext.define('PVE.lxc.CreateWizard', {
]
},
{
xtype
:
'
pveLxcResourceInputP
anel
'
,
xtype
:
'
inputp
anel
'
,
title
:
gettext
(
'
Resources
'
),
insideWizard
:
true
items
:
[
{
xtype
:
'
pveLxcMemoryInputPanel
'
,
title
:
gettext
(
'
Memory
'
),
insideWizard
:
true
},
{
xtype
:
'
pveLxcCPUInputPanel
'
,
title
:
gettext
(
'
CPU
'
),
insideWizard
:
true
}
]
},
networkpanel
,
{
...
...
www/manager/lxc/ResourceEdit.js
View file @
a3c6e044
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
();
}
});
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment