Skip to content

Commit

Permalink
Fix missing options of datepicker
Browse files Browse the repository at this point in the history
  • Loading branch information
Rogan committed Apr 21, 2017
1 parent 212cc4b commit 91a6a06
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions addons/web/static/src/js/fields/basic_fields.js
Expand Up @@ -305,7 +305,8 @@ var FieldDate = InputField.extend({
* @private
*/
_makeDatePicker: function () {
return new datepicker.DateWidget(this, {defaultDate: this.value});
var options = _.defaults(this.options || {}, {defaultDate: this.value});
return new datepicker.DateWidget(this, options);
},

/**
Expand Down Expand Up @@ -356,7 +357,8 @@ var FieldDateTime = FieldDate.extend({
*/
_makeDatePicker: function () {
var value = this.value && this.value.clone().add(this.getSession().tzOffset, 'minutes');
return new datepicker.DateTimeWidget(this, {defaultDate: value});
var options = _.defaults(this.options || {}, {defaultDate: value});
return new datepicker.DateTimeWidget(this, options);
},

/**
Expand Down

0 comments on commit 91a6a06

Please sign in to comment.