From 2cae5545966da694ed600c641c19c32991718849 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 3 Jul 2015 10:21:46 +0530 Subject: [PATCH] [fix] datepicker defaults to now --- frappe/public/js/frappe/form/control.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/frappe/public/js/frappe/form/control.js b/frappe/public/js/frappe/form/control.js index 8c997391b2..e489c96e25 100644 --- a/frappe/public/js/frappe/form/control.js +++ b/frappe/public/js/frappe/form/control.js @@ -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); },