push column items individually

looks like ExtJS is not automatically flattening the array anymore
and items in a multidimensionnal array are not displayed with ExtJS6

lxc/Config.js is still commented because we haven't reached this part
in the upgrade, but fixing there too
This commit is contained in:
Emmanuel Kasper 2016-02-29 16:29:35 +01:00 committed by Dietmar Maurer
parent eb22111997
commit a2f35eb2ea
4 changed files with 10 additions and 10 deletions

View File

@ -89,7 +89,7 @@ Ext.define('PVE.dc.AuthEdit', {
var column2 = []; var column2 = [];
if (me.authType === 'ldap' || me.authType === 'ad') { if (me.authType === 'ldap' || me.authType === 'ad') {
column2.push([ column2.push(
{ {
xtype: 'textfield', xtype: 'textfield',
fieldLabel: gettext('Server'), fieldLabel: gettext('Server'),
@ -117,7 +117,7 @@ Ext.define('PVE.dc.AuthEdit', {
name: 'secure', name: 'secure',
uncheckedValue: 0 uncheckedValue: 0
} }
]); );
} }
// Two Factor Auth settings // Two Factor Auth settings

View File

@ -184,7 +184,7 @@ Ext.define('PVE.lxc.Config', {
// } // }
// if (caps.vms['VM.Console']) { // if (caps.vms['VM.Console']) {
// me.items.push([ // me.items.push(
// { // {
// xtype: 'pveFirewallPanel', // xtype: 'pveFirewallPanel',
// title: gettext('Firewall'), // title: gettext('Firewall'),
@ -193,7 +193,7 @@ Ext.define('PVE.lxc.Config', {
// phstateid: me.hstateid, // phstateid: me.hstateid,
// itemId: 'firewall' // itemId: 'firewall'
// } // }
// ]); // );
// } // }
// if (caps.vms['Permissions.Modify']) { // if (caps.vms['Permissions.Modify']) {

View File

@ -185,7 +185,7 @@ Ext.define('PVE.node.NetworkEdit', {
]; ];
if (me.iftype === 'OVSBond') { if (me.iftype === 'OVSBond') {
column1.push([ column1.push(
{ {
xtype: 'bondModeSelector', xtype: 'bondModeSelector',
fieldLabel: gettext('Mode'), fieldLabel: gettext('Mode'),
@ -199,10 +199,10 @@ Ext.define('PVE.node.NetworkEdit', {
fieldLabel: gettext('Slaves'), fieldLabel: gettext('Slaves'),
name: 'ovs_bonds' name: 'ovs_bonds'
} }
]); );
} else { } else {
column1.push([ column1.push(
{ {
xtype: 'pvetextfield', xtype: 'pvetextfield',
deleteEmpty: !me.create, deleteEmpty: !me.create,
@ -283,7 +283,7 @@ Ext.define('PVE.node.NetworkEdit', {
vtype: 'IP6Address', vtype: 'IP6Address',
name: 'gateway6' name: 'gateway6'
} }
]); );
} }
Ext.applyIf(me, { Ext.applyIf(me, {

View File

@ -195,7 +195,7 @@ Ext.define('PVE.qemu.Config', {
} }
if (caps.vms['VM.Console']) { if (caps.vms['VM.Console']) {
me.items.push([ me.items.push(
{ {
xtype: 'pveFirewallPanel', xtype: 'pveFirewallPanel',
title: gettext('Firewall'), title: gettext('Firewall'),
@ -204,7 +204,7 @@ Ext.define('PVE.qemu.Config', {
phstateid: me.hstateid, phstateid: me.hstateid,
itemId: 'firewall' itemId: 'firewall'
} }
]); );
} }
if (caps.vms['Permissions.Modify']) { if (caps.vms['Permissions.Modify']) {