From 060b19b6351605d1f3e39335a80a562bd3a8a5f6 Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Thu, 22 May 2014 08:43:04 +0200 Subject: [PATCH] firewall rules: add fix for editable ComboGrid --- www/manager/grid/FirewallRules.js | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/www/manager/grid/FirewallRules.js b/www/manager/grid/FirewallRules.js index e5005855..cadda5d7 100644 --- a/www/manager/grid/FirewallRules.js +++ b/www/manager/grid/FirewallRules.js @@ -51,6 +51,24 @@ Ext.define('PVE.FirewallRulePanel', { allow_iface: false, + onGetValues: function(values) { + var me = this; + + // hack: editable ComboGrid returns nothing when empty, so we need to set '' + + if (values.source === undefined) { + values.source = ''; + } + if (values.dest === undefined) { + values.dest = ''; + } + if (values.proto === undefined) { + values.proto = ''; + } + + return values; + }, + initComponent : function() { var me = this; @@ -149,10 +167,12 @@ Ext.define('PVE.FirewallRulePanel', { { xtype: 'pveIPProtocolSelector', name: 'proto', + autoSelect: false, + queryDelay: 900000000, // disable query + editable: true, value: '', emptyText: 'any', - fieldLabel: gettext('Protocol'), - allowBlank: true + fieldLabel: gettext('Protocol') }, { xtype: 'displayfield',