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

Merge pull request #15150 from ruchamahabal/fix-time-format

Browse source 
fix: Add fallback option for time format when system defaults are not set
This commit is contained in:
mergify[bot] 2021-12-02 05:28:08 +00:00 • committed by GitHub
commit fe7b0719cd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/public/js/frappe/form/formatters.js
View file

@ -172,7 +172,7 @@ frappe.form.formatters = {
m = m.tz(frappe.boot.sysdefaults.time_zone);
}
return m.format(frappe.boot.sysdefaults.date_format.toUpperCase()
+ ' ' + frappe.boot.sysdefaults.time_format);
+ ' ' + (frappe.boot.sysdefaults.time_format || 'HH:mm:ss'));
} else {
return "";
}