From e357e267351b5a4c702cccebf4858327712984e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9ry=20Debongnie?= Date: Wed, 1 Mar 2017 12:41:30 +0100 Subject: [FIX] web: fix FieldDate widget default value The FieldDate widget did not properly select the correct default value when opening the datepicker. We did not notice it, because the test hardcoded the february month. --- addons/web/static/src/js/fields/basic_fields.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'addons/web/static/src/js/fields/basic_fields.js') diff --git a/addons/web/static/src/js/fields/basic_fields.js b/addons/web/static/src/js/fields/basic_fields.js index dcb65317edb..af2fdb50349 100644 --- a/addons/web/static/src/js/fields/basic_fields.js +++ b/addons/web/static/src/js/fields/basic_fields.js @@ -162,11 +162,12 @@ var FieldDate = InputField.extend({ //-------------------------------------------------------------------------- _makeDatePicker: function () { - return new datepicker.DateWidget(this); + return new datepicker.DateWidget(this, {defaultDate: this.value}); }, _renderEdit: function () { this.datewidget.set_value(this.value); }, + }); var FieldDateTime = FieldDate.extend({ @@ -177,7 +178,7 @@ var FieldDateTime = FieldDate.extend({ //-------------------------------------------------------------------------- _makeDatePicker: function () { - return new datepicker.DateTimeWidget(this); + return new datepicker.DateTimeWidget(this, {defaultDate: this.value}); }, }); -- cgit v1.2.3