Browse Source

Merge pull request #1179 from rmehta/datepicker-default

[fix] datepicker defaults to now
version-14
Rushabh Mehta 10 years ago
parent
commit
06fc344d1e
1 changed files with 7 additions and 3 deletions
  1. +7
    -3
      frappe/public/js/frappe/form/control.js

+ 7
- 3
frappe/public/js/frappe/form/control.js View File

@@ -547,9 +547,13 @@ frappe.ui.form.ControlTime = frappe.ui.form.ControlData.extend({

frappe.ui.form.ControlDatetime = frappe.ui.form.ControlDate.extend({
set_datepicker: function() {
this.datepicker_options.timeFormat = "HH:mm:ss";
this.datepicker_options.dateFormat =
(frappe.boot.sysdefaults.date_format || 'yy-mm-dd').replace('yyyy','yy');
var now = new Date();
$.extend(this.datepicker_options, {
"timeFormat": "HH:mm:ss",
"dateFormat": (frappe.boot.sysdefaults.date_format || 'yy-mm-dd').replace('yyyy','yy'),
"hour": now.getHours(),
"minute": now.getMinutes()
});

this.$input.datetimepicker(this.datepicker_options);
},


Loading…
Cancel
Save