vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix: has-error respects both invalid and mandatory

Browse source 
previously set_invalid would remove (if there was no invalid entry) has-error class which were set by set_mandatory

fixes #35789
This commit is contained in:
stravo1@mac 2026-02-20 23:14:48 +05:30
parent 95283be9f5
commit 5c704c3d87
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
frappe/public/js/frappe/form/controls/base_input.js
View file

@ -277,7 +277,9 @@ frappe.ui.form.ControlInput = class ControlInput extends frappe.ui.form.Control
// set has-error if dialog primary button is clicked
if (this.layout && this.layout.is_dialog && !this.layout.primary_action_fulfilled) return;
this.$wrapper.toggleClass("has-error", Boolean(this.df.reqd && is_null(value)));
const is_invalid = this.$wrapper.hasClass("has-error-invalid");
this.$wrapper.toggleClass("has-error-mandatory", Boolean(this.df.reqd && is_null(value)));
this.$wrapper.toggleClass("has-error", is_invalid || Boolean(this.df.reqd && is_null(value)));
}
set_invalid() {
let invalid = !!this.df.invalid;
@ -286,7 +288,9 @@ frappe.ui.form.ControlInput = class ControlInput extends frappe.ui.form.Control
this.$input?.toggleClass("invalid", invalid);
this.grid_row.columns[this.df.fieldname].is_invalid = invalid;
} else {
this.$wrapper.toggleClass("has-error", invalid);
const is_mandatory_and_empty = this.$wrapper.hasClass("has-error-mandatory");
this.$wrapper.toggleClass("has-error-invalid", invalid);
this.$wrapper.toggleClass("has-error", is_mandatory_and_empty || invalid);
}
}
set_required() {