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

Merge pull request #37320 from GursheenK/webform-datetime-field-format

Browse source 
fix(Web Form): Time and Datetime default keywords not resolved
This commit is contained in:
Gursheen Kaur Anand 2026-02-26 16:55:43 +05:30 • committed by GitHub
commit 5efbf0e613
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
frappe/public/js/frappe/ui/field_group.js
View file

@ -18,6 +18,27 @@ frappe.ui.FieldGroup = class FieldGroup extends frappe.ui.form.Layout {
}
}
resolve_date_default_keywords(def_value, fieldtype) {
if (!def_value || typeof def_value !== "string") return def_value;
def_value = def_value.toLowerCase();
if (def_value == "today" && fieldtype == "Date") {
return frappe.datetime.get_today();
}
if (def_value == "now") {
if (fieldtype == "Datetime") {
return frappe.datetime.now_datetime();
}
if (fieldtype == "Time") {
return frappe.datetime.now_time();
}
}
return def_value;
}
make() {
let me = this;
if (this.fields) {
@ -33,8 +54,8 @@ frappe.ui.FieldGroup = class FieldGroup extends frappe.ui.form.Layout {
)
return;
if (def_value == "Today" && field.df["fieldtype"] == "Date") {
def_value = frappe.datetime.get_today();
if (["Date", "Datetime", "Time"].includes(field.df.fieldtype)) {
def_value = me.resolve_date_default_keywords(def_value, field.df.fieldtype);
}
field.set_input(def_value);