diff options
| author | Christophe Simonis <chs@odoo.com> | 2019-03-26 10:33:26 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2019-03-26 10:33:26 +0100 |
| commit | 5dbf7bf357f8f76a9e36f4707bd9e9bfc77e3436 (patch) | |
| tree | fecaa70fd89a26938b03ad124cb326b6523f47bc /addons/web/static/src | |
| parent | 02f5b654c385772649534fe205d3328fb21354ba (diff) | |
| parent | f00c490be8688d80f211f6755b5ada541eefd602 (diff) | |
[MERGE] forward port branch saas-12.1 up to f00c490be86
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/js/views/calendar/calendar_controller.js | 6 | ||||
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/addons/web/static/src/js/views/calendar/calendar_controller.js b/addons/web/static/src/js/views/calendar/calendar_controller.js index 0934ae462b3..af31c252898 100644 --- a/addons/web/static/src/js/views/calendar/calendar_controller.js +++ b/addons/web/static/src/js/views/calendar/calendar_controller.js @@ -19,6 +19,10 @@ var QuickCreate = require('web.CalendarQuickCreate'); var _t = core._t; var QWeb = core.qweb; +function dateToServer (date) { + return date.clone().utc().locale('en').format('YYYY-MM-DD HH:mm:ss'); +} + var CalendarController = AbstractController.extend({ custom_events: _.extend({}, AbstractController.prototype.custom_events, { changeDate: '_onChangeDate', @@ -236,7 +240,7 @@ var CalendarController = AbstractController.extend({ for (var k in context) { if (context[k] && context[k]._isAMomentObject) { - context[k] = context[k].clone().utc().format('YYYY-MM-DD HH:mm:ss'); + context[k] = dateToServer(context[k]); } } diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 7a6bca6aa7a..f28190d2700 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1505,7 +1505,7 @@ <t t-set="att_prev" t-value="{'accesskey': 'p'}" /> <t t-set="att_next" t-value="{'accesskey': 'n'}" /> </t> - <button type="button" class="fa fa-chevron-left btn btn-secondary o_pager_previous" t-att="att_prev" aria-label="Previous" title="Next" tabindex="-1"/> + <button type="button" class="fa fa-chevron-left btn btn-secondary o_pager_previous" t-att="att_prev" aria-label="Previous" title="Previous" tabindex="-1"/> <button type="button" class="fa fa-chevron-right btn btn-secondary o_pager_next" t-att="att_next" aria-label="Next" title="Next" tabindex="-1"/> </span> </div> |