diff options
| author | Jason Van Malder <jvm@odoo.com> | 2020-01-31 11:29:40 +0000 |
|---|---|---|
| committer | Jason Van Malder <jvm@odoo.com> | 2020-01-31 13:43:20 +0000 |
| commit | 83f2811217ba3b178046f7be4f34303182f07ef2 (patch) | |
| tree | 298fdf0acd93379006eae3594b80ecb841830eb2 /addons/survey/static | |
| parent | fba5b5fb967d940eeccf862791d5c05d510bb9b7 (diff) | |
[FIX] survey: fix datetime picker
Fixing 59a50e7628e3, were minDate & maxDate are declared before usage.
closes odoo/odoo#44368
Signed-off-by: Nicolas Martinelli (nim) <nim@odoo.com>
Diffstat (limited to 'addons/survey/static')
| -rw-r--r-- | addons/survey/static/src/js/survey_form.js | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/addons/survey/static/src/js/survey_form.js b/addons/survey/static/src/js/survey_form.js index f270949903d..21bad10c7fd 100644 --- a/addons/survey/static/src/js/survey_form.js +++ b/addons/survey/static/src/js/survey_form.js @@ -753,27 +753,28 @@ publicWidget.registry.SurveyFormWidget = publicWidget.Widget.extend({ * Initialize datetimepicker in correct format and with constraints */ _initDateTimePicker: function ($dateGroup) { - var disabledDates = [] - var minDateData = $dateGroup.data('mindate') - var maxDateData = $dateGroup.data('maxdate') + var disabledDates = []; + var questionType = $dateGroup.find('input').data('questionType'); + var minDateData = $dateGroup.data('mindate'); + var maxDateData = $dateGroup.data('maxdate'); - var datetimepickerFormat = time.getLangDateFormat(); - if ($dateGroup.find('input').data('questionType') === 'datetime') { - datetimepickerFormat = time.getLangDatetimeFormat(); - } else { + var datetimepickerFormat = questionType === 'datetime' ? time.getLangDatetimeFormat() : time.getLangDateFormat(); + + var minDate = minDateData + ? this._formatDateTime(minDateData, datetimepickerFormat) + : moment({ y: 1900 }); + + var maxDate = maxDateData + ? this._formatDateTime(maxDateData, datetimepickerFormat) + : moment().add(200, "y"); + + if (questionType === 'date') { // Include min and max date in selectable values maxDate = moment(maxDate).add(1, "d"); minDate = moment(minDate).subtract(1, "d"); disabledDates = [minDate, maxDate]; } - var minDate = minDateData - ? this._formatDateTime(minDateData, datetimepickerFormat) - : moment({ y: 1900 }); - var maxDate = maxDateData - ? this._formatDateTime(maxDateData, datetimepickerFormat) - : moment().add(200, "y"); - $dateGroup.datetimepicker({ format : datetimepickerFormat, minDate: minDate, |
