code cleanups, only set modified_marker when we have errors

diff --git a/www/manager/form/IPSetSelector.js b/www/manager/form/IPSetSelector.js
index d19ead28b7b687452ece6290174276cbdd566a97..380f2ad68299488aa038601d8a7b084183e79cff 100644 (file)
--- a/www/manager/form/IPSetSelector.js
+++ b/www/manager/form/IPSetSelector.js
@@ -4,6 +4,8 @@ Ext.define('PVE.form.IPSetSelector', {
 
     base_url: undefined,
 
+    preferredValue: '', // hack: else Form sets dirty flag?
+
     initComponent: function() {
        var me = this;
 
@@ -25,6 +27,14 @@ Ext.define('PVE.form.IPSetSelector', {
            }
        });
 
+       var disable_query_for_ips = function(f, value) {
+           if (value.match(/^\d/)) { // IP address starts with \d
+               f.queryDelay = 9999999999; // hack: disbale with long delay
+           } else {
+               f.queryDelay = 10;
+           }
+       };
+
        Ext.apply(me, {
            store: store,
            valueField: 'ref',
@@ -52,6 +62,8 @@ Ext.define('PVE.form.IPSetSelector', {
            }
        });
 
+       me.on('change', disable_query_for_ips);
+
         me.callParent();
     }
 });

diff --git a/www/manager/grid/FirewallRules.js b/www/manager/grid/FirewallRules.js
index fd83524c82ef59513ca5ae460fc95edcbea848f9..b0c7b39b727e5820449bcf8e0b834923788de10a 100644 (file)
--- a/www/manager/grid/FirewallRules.js
+++ b/www/manager/grid/FirewallRules.js
@@ -121,14 +121,6 @@ Ext.define('PVE.FirewallRulePanel', {
            });
        }
 
-       var disable_query_for_ips = function(f, value) {
-           if (value.match(/^\d/)) { // IP address starts with \d
-               f.queryDelay = 9999999999; // hack: disbale with long delay
-           } else {
-               f.queryDelay = 10;
-           }
-       };
-
        me.column1.push([
            {
                xtype: 'displayfield',
@@ -143,21 +135,17 @@ Ext.define('PVE.FirewallRulePanel', {
                editable: true,
                base_url: me.ipset_base_url,
                value: '',
-               preferredValue: '', // hack: else Form sets dirty flag?
-               fieldLabel: gettext('Source'),
-               listeners: { change: disable_query_for_ips }
+               fieldLabel: gettext('Source')
+
            },
            {
                xtype: 'pveIPSetSelector',
                name: 'dest',
                autoSelect: false,
-               typeAhead: true,
                editable: true,
                base_url: me.ipset_base_url,
                value: '',
-               preferredValue: '', // hack: else Form sets dirty flag?
-               fieldLabel: gettext('Destination'),
-               listeners: { change: disable_query_for_ips }
+               fieldLabel: gettext('Destination')
            }
        ]);
 
@@ -282,12 +270,12 @@ Ext.define('PVE.FirewallRuleEdit', {
 
        if (!me.create) {
            me.load({
-               success:  function(response, options) {
+               success: function(response, options) {
                    var values = response.result.data;
                    ipanel.setValues(values);
-                   var field = me.query('[isFormField][name=modified_marker]')[0];
-                   field.setValue(1);
                    if (values.errors) {
+                       var field = me.query('[isFormField][name=modified_marker]')[0];
+                       field.setValue(1);
                        Ext.Function.defer(function() {
                            var form = ipanel.up('form').getForm();
                            form.markInvalid(values.errors)