From 734b37950ed0fcb09c2323f85e858222ff4daaa3 Mon Sep 17 00:00:00 2001
From: Emmanuel Kasper <e.kasper@proxmox.com>
Date: Mon, 8 Feb 2016 14:29:54 +0100
Subject: [PATCH] ext6migrate: last fixes for firewall

listen to 'activate' event is needed because of framework changes,
similar to c0b3df6e34f51a247b477df490db5d52eb0d62a0

ext6migrate: listen to 'activate' events for panels inside a tabpanel
---
 www/manager6/form/FirewallPolicySelector.js | 13 +++----------
 www/manager6/grid/FirewallOptions.js        |  4 ++--
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/www/manager6/form/FirewallPolicySelector.js b/www/manager6/form/FirewallPolicySelector.js
index 81492a66..05eea901 100644
--- a/www/manager6/form/FirewallPolicySelector.js
+++ b/www/manager6/form/FirewallPolicySelector.js
@@ -1,16 +1,9 @@
 Ext.define('PVE.form.FirewallPolicySelector', {
     extend: 'PVE.form.KVComboBox',
     alias: ['widget.pveFirewallPolicySelector'],
-  
-    initComponent: function() {
-	var me = this;
-
-	me.data = [ 
-	    ['ACCEPT', 'ACCEPT'], 
+    comboItems: [
+	    ['ACCEPT', 'ACCEPT'],
 	    ['REJECT', 'REJECT'],
 	    [ 'DROP', 'DROP']
-	];
-
-	me.callParent();
-    }
+	]
 });
diff --git a/www/manager6/grid/FirewallOptions.js b/www/manager6/grid/FirewallOptions.js
index f94be6cb..a2f99545 100644
--- a/www/manager6/grid/FirewallOptions.js
+++ b/www/manager6/grid/FirewallOptions.js
@@ -94,7 +94,7 @@ Ext.define('PVE.FirewallOptions', {
 			xtype: 'pveKVComboBox',
 			name: name,
 			fieldLabel: name,
-			data: [['nolog', 'nolog'], ['info', 'info'], ['err', 'err'],
+			comboItems: [['nolog', 'nolog'], ['info', 'info'], ['err', 'err'],
 			       ['warning', 'warning'], ['crit', 'crit'], ['alert', 'alert'],
 			       ['emerg', 'emerg'], ['debug', 'debug']]
 		    }
@@ -226,6 +226,6 @@ Ext.define('PVE.FirewallOptions', {
 
 	me.callParent();
 
-	me.on('show', reload);
+	me.on('activate', reload);
     }
 });