changeset c5d8cbdd493f in sao:6.0 details: https://hg.tryton.org/sao?cmd=changeset&node=c5d8cbdd493f description: Use local date format as default and use context date format as fallback
issue11728 review427801003 (grafted from 9f95f2077dad49a75c7039805537487f37381787) diffstat: src/common.js | 2 +- src/view/form.js | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diffs (66 lines): diff -r fbe7b1d3ea56 -r c5d8cbdd493f src/common.js --- a/src/common.js Thu Sep 15 21:36:56 2022 +0200 +++ b/src/common.js Sat Oct 01 14:15:05 2022 +0200 @@ -226,7 +226,7 @@ Sao.common.date_format = function(format) { if (jQuery.isEmptyObject(format)) { - format = '%Y-%m-%d'; + format = '%x'; if (Sao.Session.current_session) { var context = Sao.Session.current_session.context; if (context.locale && context.locale.date) { diff -r fbe7b1d3ea56 -r c5d8cbdd493f src/view/form.js --- a/src/view/form.js Thu Sep 15 21:36:56 2022 +0200 +++ b/src/view/form.js Sat Oct 01 14:15:05 2022 +0200 @@ -1594,7 +1594,6 @@ _input_format: '%Y-%m-%d', _format: Sao.common.format_date, _parse: Sao.common.parse_date, - _default_format: '%x', init: function(view, attributes) { Sao.View.Form.Date._super.init.call(this, view, attributes); this.el = jQuery('<div/>', { @@ -1673,7 +1672,8 @@ if (this.field && this.record) { return this.field.date_format(this.record); } else { - return this._default_format; + return Sao.common.date_format( + this.view.screen.context.date_format); } }, get_value: function() { @@ -1730,13 +1730,13 @@ _input_format: '%Y-%m-%dT%H:%M:%S', _format: Sao.common.format_datetime, _parse: Sao.common.parse_datetime, - _default_format: '%x %X', get_format: function() { if (this.field && this.record) { return (this.field.date_format(this.record) + ' ' + this.field.time_format(this.record)); } else { - return this._default_format; + return (Sao.common.date_format( + this.view.screen.context.date_format) + ' %X'); } }, cast: function(value){ @@ -1751,7 +1751,6 @@ _input_format: '%H:%M:%S', _format: Sao.common.format_time, _parse: Sao.common.parse_time, - _default_format: '%X', init: function(view, attributes) { Sao.View.Form.Time._super.init.call(this, view, attributes); if (~navigator.userAgent.indexOf("Firefox")) { @@ -1763,7 +1762,7 @@ if (this.field && this.record) { return this.field.time_format(this.record); } else { - return this._default_format; + return '%X'; } }, cast: function(value){