Commit df3feb46 authored by Dietmar Maurer's avatar Dietmar Maurer

code cleanups, only set modified_marker when we have errors

parent 7e50c2bc
...@@ -4,6 +4,8 @@ Ext.define('PVE.form.IPSetSelector', { ...@@ -4,6 +4,8 @@ Ext.define('PVE.form.IPSetSelector', {
base_url: undefined, base_url: undefined,
preferredValue: '', // hack: else Form sets dirty flag?
initComponent: function() { initComponent: function() {
var me = this; var me = this;
...@@ -25,6 +27,14 @@ Ext.define('PVE.form.IPSetSelector', { ...@@ -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, { Ext.apply(me, {
store: store, store: store,
valueField: 'ref', valueField: 'ref',
...@@ -52,6 +62,8 @@ Ext.define('PVE.form.IPSetSelector', { ...@@ -52,6 +62,8 @@ Ext.define('PVE.form.IPSetSelector', {
} }
}); });
me.on('change', disable_query_for_ips);
me.callParent(); me.callParent();
} }
}); });
......
...@@ -121,14 +121,6 @@ Ext.define('PVE.FirewallRulePanel', { ...@@ -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([ me.column1.push([
{ {
xtype: 'displayfield', xtype: 'displayfield',
...@@ -143,21 +135,17 @@ Ext.define('PVE.FirewallRulePanel', { ...@@ -143,21 +135,17 @@ Ext.define('PVE.FirewallRulePanel', {
editable: true, editable: true,
base_url: me.ipset_base_url, base_url: me.ipset_base_url,
value: '', value: '',
preferredValue: '', // hack: else Form sets dirty flag? fieldLabel: gettext('Source')
fieldLabel: gettext('Source'),
listeners: { change: disable_query_for_ips }
}, },
{ {
xtype: 'pveIPSetSelector', xtype: 'pveIPSetSelector',
name: 'dest', name: 'dest',
autoSelect: false, autoSelect: false,
typeAhead: true,
editable: true, editable: true,
base_url: me.ipset_base_url, base_url: me.ipset_base_url,
value: '', value: '',
preferredValue: '', // hack: else Form sets dirty flag? fieldLabel: gettext('Destination')
fieldLabel: gettext('Destination'),
listeners: { change: disable_query_for_ips }
} }
]); ]);
...@@ -282,12 +270,12 @@ Ext.define('PVE.FirewallRuleEdit', { ...@@ -282,12 +270,12 @@ Ext.define('PVE.FirewallRuleEdit', {
if (!me.create) { if (!me.create) {
me.load({ me.load({
success: function(response, options) { success: function(response, options) {
var values = response.result.data; var values = response.result.data;
ipanel.setValues(values); ipanel.setValues(values);
var field = me.query('[isFormField][name=modified_marker]')[0];
field.setValue(1);
if (values.errors) { if (values.errors) {
var field = me.query('[isFormField][name=modified_marker]')[0];
field.setValue(1);
Ext.Function.defer(function() { Ext.Function.defer(function() {
var form = ipanel.up('form').getForm(); var form = ipanel.up('form').getForm();
form.markInvalid(values.errors) form.markInvalid(values.errors)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment