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

Merge pull request #38536 from kaulith/fix/webform-hidden-mandatory-validation

Browse source
This commit is contained in:
Hussain Nagaria 2026-04-19 17:02:40 +05:30 • committed by GitHub
commit f1755daab9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
frappe/public/js/frappe/web_form/web_form.js
View file

@ -161,7 +161,7 @@ export default class WebForm extends frappe.ui.FieldGroup {
let values = frappe.utils.get_query_params();
delete values.new;
Object.assign(defaults, values);
this.set_values(values);
this.set_values(defaults);
}
setup_primary_action() {
@ -226,6 +226,8 @@ export default class WebForm extends frappe.ui.FieldGroup {
field = this.fields_dict[fieldname];
if (field && field.get_value) {
if (field.df.hidden) continue;
let value = field.get_value();
if (
field.df.reqd &&

15
frappe/website/doctype/web_form/web_form.py
View file

@ -8,6 +8,7 @@ from typing import Any
import frappe
from frappe import _, scrub
from frappe.core.api.file import get_max_file_size
from frappe.core.doctype.doctype.doctype import HiddenAndMandatoryWithoutDefaultError
from frappe.core.doctype.file.utils import remove_file_by_url
from frappe.desk.form.meta import get_code_files_via_hooks
from frappe.modules.utils import export_module_json, get_doc_module
@ -96,6 +97,8 @@ class WebForm(WebsiteGenerator):
if not frappe.flags.in_import:
self.validate_fields()
self.validate_hidden_and_mandatory()
def validate_fields(self):
"""Validate all fields are present"""
from frappe.model import no_value_fields
@ -110,6 +113,18 @@ class WebForm(WebsiteGenerator):
if missing:
frappe.throw(_("Following fields are missing:") + "<br>" + "<br>".join(missing))
def validate_hidden_and_mandatory(self):
if self.allow_incomplete:
return
for d in self.web_form_fields:
if (d.hidden and d.reqd) and not (d.default or frappe.flags.in_migrate):
frappe.throw(
_("{0}: Field {1} in row {2} cannot be hidden and mandatory without default").format(
self.name, d.label, d.idx
),
HiddenAndMandatoryWithoutDefaultError,
)
def reset_field_parent(self):
"""Convert link fields to select with names as options."""
for df in self.web_form_fields: