From 6281758a6e26b01fd75421e51726b99930d041fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20BEAU?= Date: Mon, 27 Feb 2023 09:55:57 +0100 Subject: [PATCH] jsonifier: remove deprecated logic for getting the date in user tz --- jsonifier/models/models.py | 13 +------------ jsonifier/tests/test_get_parser.py | 2 +- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/jsonifier/models/models.py b/jsonifier/models/models.py index bf0fa2112..c9ea16450 100644 --- a/jsonifier/models/models.py +++ b/jsonifier/models/models.py @@ -49,10 +49,6 @@ class Base(models.AbstractModel): elif field.type == "datetime": # Ensures value is a datetime value = fields.Datetime.to_datetime(value) - if self.env.context.get("jsonifier__date_user_tz"): - # Get the timestamp converted to the client's timezone. - # This call also add the tzinfo into the datetime object - value = fields.Datetime.context_timestamp(self, value) value = value.isoformat() elif field.type in ("many2one", "reference"): value = value.display_name if value else None @@ -163,16 +159,9 @@ class Base(models.AbstractModel): results = [{} for record in self] parsers = {False: parser["fields"]} if "fields" in parser else parser["langs"] - records = self - if "jsonifier__date_user_tz" not in self.env.context: - # TODO: backward compat flag for v < 15.0 - # Dates must always be UTC and the client/consumer of this data - # should deal w/ the format as preferred. - # Drop this flag for v15! - records = records.with_context(jsonifier__date_user_tz=True) for lang in parsers: translate = lang or parser.get("language_agnostic") - records = records.with_context(lang=lang) if translate else records + records = self.with_context(lang=lang) if translate else self for record, json in zip(records, results): self._jsonify_record(parsers[lang], record, json) diff --git a/jsonifier/tests/test_get_parser.py b/jsonifier/tests/test_get_parser.py index f91971921..9b608bd29 100644 --- a/jsonifier/tests/test_get_parser.py +++ b/jsonifier/tests/test_get_parser.py @@ -165,7 +165,7 @@ class TestParser(TransactionCase): "email": None, } ], - "create_date": "2019-10-31T15:39:49+01:00", + "create_date": "2019-10-31T14:39:49", "date": "2019-10-31", } json_partner = self.partner.jsonify(parser)