From 53395db153796cb293cff5c2f8f0213672fc9f8d Mon Sep 17 00:00:00 2001
From: Dominik Csapak <d.csapak@proxmox.com>
Date: Thu, 5 Apr 2018 16:03:54 +0200
Subject: [PATCH] lxc/ResoureEdit: move some cpu fields to advanced options

and show them now also in the wizard

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 www/manager6/lxc/ResourceEdit.js | 69 +++++++++++++++-----------------
 1 file changed, 32 insertions(+), 37 deletions(-)

diff --git a/www/manager6/lxc/ResourceEdit.js b/www/manager6/lxc/ResourceEdit.js
index 395c31e8..ec697cac 100644
--- a/www/manager6/lxc/ResourceEdit.js
+++ b/www/manager6/lxc/ResourceEdit.js
@@ -55,54 +55,49 @@ Ext.define('PVE.lxc.CPUInputPanel', {
 	return values;
     },
 
-    initComponent : function() {
+    advancedColumn1: [
+	{
+	    xtype: 'numberfield',
+	    name: 'cpulimit',
+	    minValue: 0,
+	    value: '',
+	    step: 1,
+	    fieldLabel: gettext('CPU limit'),
+	    allowBlank: true,
+	    emptyText: gettext('unlimited')
+	}
+    ],
+
+    advancedColumn2: [
+	{
+	    xtype: 'proxmoxintegerfield',
+	    name: 'cpuunits',
+	    fieldLabel: gettext('CPU units'),
+	    value: 1024,
+	    minValue: 8,
+	    maxValue: 500000,
+	    labelWidth: labelWidth,
+	    allowBlank: false
+	}
+    ],
+
+    initComponent: function() {
 	var me = this;
 
-	var column1 = [
-            {
-                xtype: 'proxmoxintegerfield',
-                name: 'cores',
+	me.column1 = [
+	    {
+		xtype: 'proxmoxintegerfield',
+		name: 'cores',
 		minValue: 1,
 		maxValue: 128,
 		value: me.insideWizard ? 1 : '',
 		fieldLabel: gettext('Cores'),
 		allowBlank: true,
 		deleteEmpty: true,
-                emptyText: gettext('unlimited')
-            }
-	];
-
-	var column2 = [
-	    {
-		xtype: 'numberfield',
-		name: 'cpulimit',
-		minValue: 0,
-		value: '',
-		step: 1,
-		fieldLabel: gettext('CPU limit'),
-		labelWidth: labelWidth,
-		allowBlank: true,
-                emptyText: gettext('unlimited')
-	    },
-	    {
-		xtype: 'proxmoxintegerfield',
-		name: 'cpuunits',
-		fieldLabel: gettext('CPU units'),
-		value: 1024,
-		minValue: 8,
-		maxValue: 500000,
-		labelWidth: labelWidth,
-		allowBlank: false
+		emptyText: gettext('unlimited')
 	    }
 	];
 
-	if (me.insideWizard) {
-	    me.column1 = column1;
-	} else {
-	    me.column1 = column1;
-	    me.column2 = column2;
-	}
-   
 	me.callParent();
     }
 });