From a2f35eb2ea6835c3d3e6723c625693375038a209 Mon Sep 17 00:00:00 2001 From: Emmanuel Kasper Date: Mon, 29 Feb 2016 16:29:35 +0100 Subject: [PATCH] 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 --- www/manager6/dc/AuthEdit.js | 4 ++-- www/manager6/lxc/Config.js | 4 ++-- www/manager6/node/NetworkEdit.js | 8 ++++---- www/manager6/qemu/Config.js | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/www/manager6/dc/AuthEdit.js b/www/manager6/dc/AuthEdit.js index f3abd61b..29855501 100644 --- a/www/manager6/dc/AuthEdit.js +++ b/www/manager6/dc/AuthEdit.js @@ -89,7 +89,7 @@ Ext.define('PVE.dc.AuthEdit', { var column2 = []; if (me.authType === 'ldap' || me.authType === 'ad') { - column2.push([ + column2.push( { xtype: 'textfield', fieldLabel: gettext('Server'), @@ -117,7 +117,7 @@ Ext.define('PVE.dc.AuthEdit', { name: 'secure', uncheckedValue: 0 } - ]); + ); } // Two Factor Auth settings diff --git a/www/manager6/lxc/Config.js b/www/manager6/lxc/Config.js index 399b3526..a05fb081 100644 --- a/www/manager6/lxc/Config.js +++ b/www/manager6/lxc/Config.js @@ -184,7 +184,7 @@ Ext.define('PVE.lxc.Config', { // } // if (caps.vms['VM.Console']) { -// me.items.push([ +// me.items.push( // { // xtype: 'pveFirewallPanel', // title: gettext('Firewall'), @@ -193,7 +193,7 @@ Ext.define('PVE.lxc.Config', { // phstateid: me.hstateid, // itemId: 'firewall' // } -// ]); +// ); // } // if (caps.vms['Permissions.Modify']) { diff --git a/www/manager6/node/NetworkEdit.js b/www/manager6/node/NetworkEdit.js index 43f69e33..af798d50 100644 --- a/www/manager6/node/NetworkEdit.js +++ b/www/manager6/node/NetworkEdit.js @@ -185,7 +185,7 @@ Ext.define('PVE.node.NetworkEdit', { ]; if (me.iftype === 'OVSBond') { - column1.push([ + column1.push( { xtype: 'bondModeSelector', fieldLabel: gettext('Mode'), @@ -199,10 +199,10 @@ Ext.define('PVE.node.NetworkEdit', { fieldLabel: gettext('Slaves'), name: 'ovs_bonds' } - ]); + ); } else { - column1.push([ + column1.push( { xtype: 'pvetextfield', deleteEmpty: !me.create, @@ -283,7 +283,7 @@ Ext.define('PVE.node.NetworkEdit', { vtype: 'IP6Address', name: 'gateway6' } - ]); + ); } Ext.applyIf(me, { diff --git a/www/manager6/qemu/Config.js b/www/manager6/qemu/Config.js index 6f1d2150..0e217672 100644 --- a/www/manager6/qemu/Config.js +++ b/www/manager6/qemu/Config.js @@ -195,7 +195,7 @@ Ext.define('PVE.qemu.Config', { } if (caps.vms['VM.Console']) { - me.items.push([ + me.items.push( { xtype: 'pveFirewallPanel', title: gettext('Firewall'), @@ -204,7 +204,7 @@ Ext.define('PVE.qemu.Config', { phstateid: me.hstateid, itemId: 'firewall' } - ]); + ); } if (caps.vms['Permissions.Modify']) {