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

Merge pull request #5806 from pratu16x7/website-datetime

Browse source 
[fix] fulfill datetime requirement for webform
This commit is contained in:
Prateeksha Singh 2018-07-10 22:18:02 +05:30 • committed by GitHub
commit 85a817cc71
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
frappe/public/build.json
View file

@ -344,6 +344,7 @@
"public/js/frappe/views/reports/print_tree.html"
],
"js/web_form.min.js": [
"public/js/frappe/misc/datetime.js",
"website/js/web_form.js",
"public/js/lib/summernote/summernote.js",
"public/js/lib/datepicker/datepicker.min.js",

4
frappe/public/js/frappe/form/controls/date.js
View file

@ -9,7 +9,7 @@ frappe.ui.form.ControlDate = frappe.ui.form.ControlData.extend({
},
set_formatted_input: function(value) {
this._super(value);
if(!value) return;
if(!value || !this.datepicker) return;
let should_refresh = this.last_value && this.last_value !== value;
@ -27,7 +27,6 @@ frappe.ui.form.ControlDate = frappe.ui.form.ControlData.extend({
}
}
if(should_refresh) {
this.datepicker.selectDate(frappe.datetime.str_to_obj(value));
}
@ -123,7 +122,6 @@ frappe.ui.form.ControlDate = frappe.ui.form.ControlData.extend({
},
validate: function(value) {
if(value && !frappe.datetime.validate(value)) {
// webformTODO:
let sysdefaults = frappe.sys_defaults;
let date_format = sysdefaults && sysdefaults.date_format
? sysdefaults.date_format : 'yyyy-mm-dd';

3
frappe/public/js/frappe/misc/datetime.js
View file

@ -2,6 +2,7 @@
// MIT License. See license.txt
frappe.provide('frappe.datetime');
import moment from 'moment';
frappe.defaultDateFormat = "YYYY-MM-DD";
frappe.defaultTimeFormat = "HH:mm:ss";
@ -91,7 +92,7 @@ $.extend(frappe.datetime, {
},
get_user_fmt: function() {
return frappe.sys_defaults.date_format || "yyyy-mm-dd";
return frappe.sys_defaults && frappe.sys_defaults.date_format || "yyyy-mm-dd";
},
str_to_user: function(val, only_time = false) {