mirror of
https://github.com/pgadmin-org/pgadmin4.git
synced 2025-02-25 18:55:31 -06:00
Set the value in the model when the value is valid in the
IntegerControl.
This commit is contained in:
parent
a611f84aad
commit
6062343bf5
@ -1034,11 +1034,13 @@
|
|||||||
value = this.getValueFromDOM(),
|
value = this.getValueFromDOM(),
|
||||||
min_value = field.min,
|
min_value = field.min,
|
||||||
max_value = field.max,
|
max_value = field.max,
|
||||||
|
isValid = true,
|
||||||
intPattern = new RegExp("^-?[0-9]*$"),
|
intPattern = new RegExp("^-?[0-9]*$"),
|
||||||
isMatched = intPattern.test(value);
|
isMatched = intPattern.test(value);
|
||||||
|
|
||||||
// Below logic will validate input
|
// Below logic will validate input
|
||||||
if (!isMatched) {
|
if (!isMatched) {
|
||||||
|
isValid = false;
|
||||||
this.model.errorModel.unset(name);
|
this.model.errorModel.unset(name);
|
||||||
this.model.errorModel.set(
|
this.model.errorModel.set(
|
||||||
name,
|
name,
|
||||||
@ -1049,7 +1051,8 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Below will check if entered value is in-between min & max range
|
// Below will check if entered value is in-between min & max range
|
||||||
if (!_.isUndefined(min_value) && value < min_value) {
|
if (isValid && (!_.isUndefined(min_value) && value < min_value)) {
|
||||||
|
isValid = false;
|
||||||
this.model.errorModel.unset(name);
|
this.model.errorModel.unset(name);
|
||||||
this.model.errorModel.set(
|
this.model.errorModel.set(
|
||||||
name,
|
name,
|
||||||
@ -1060,7 +1063,8 @@
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!_.isUndefined(max_value) && value > max_value) {
|
if (isValid && (!_.isUndefined(max_value) && value > max_value)) {
|
||||||
|
isValid = false;
|
||||||
this.model.errorModel.unset(name);
|
this.model.errorModel.unset(name);
|
||||||
this.model.errorModel.set(
|
this.model.errorModel.set(
|
||||||
name,
|
name,
|
||||||
@ -1070,6 +1074,13 @@
|
|||||||
).value()
|
).value()
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// After validation we need to set that value into model (only if all falgs are true)
|
||||||
|
if (isValid) {
|
||||||
|
this.stopListening(this.model, "change:" + name, this.render);
|
||||||
|
this.model.set(name, value);
|
||||||
|
this.listenTo(this.model, "change:" + name, this.render);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user