Compare commits

...

2 Commits

Author SHA1 Message Date
GitHub Actions
6b248ef140 Auto translate strings 2025-06-29 04:40:53 +00:00
shamoon
735681d294
Fix: correct api created coercion with timezone (#10287) 2025-06-28 21:39:14 -07:00
3 changed files with 35 additions and 10 deletions

View File

@ -18,7 +18,11 @@ from django.core.validators import MaxLengthValidator
from django.core.validators import RegexValidator from django.core.validators import RegexValidator
from django.core.validators import integer_validator from django.core.validators import integer_validator
from django.utils.crypto import get_random_string from django.utils.crypto import get_random_string
from django.utils.dateparse import parse_datetime
from django.utils.text import slugify from django.utils.text import slugify
from django.utils.timezone import get_current_timezone
from django.utils.timezone import is_naive
from django.utils.timezone import make_aware
from django.utils.translation import gettext as _ from django.utils.translation import gettext as _
from drf_spectacular.utils import extend_schema_field from drf_spectacular.utils import extend_schema_field
from drf_spectacular.utils import extend_schema_serializer from drf_spectacular.utils import extend_schema_serializer
@ -972,11 +976,11 @@ class DocumentSerializer(
and ":" in data["created"] and ":" in data["created"]
): ):
# Handle old format of isoformat datetime string # Handle old format of isoformat datetime string
try: parsed = parse_datetime(data["created"])
data["created"] = datetime.fromisoformat(data["created"]).date() if parsed:
except ValueError: # pragma: no cover if is_naive(parsed):
# Just pass, validation will catch it parsed = make_aware(parsed, get_current_timezone())
pass data["created"] = parsed.astimezone().date()
return super().to_internal_value(data) return super().to_internal_value(data)
def validate(self, attrs): def validate(self, attrs):

View File

@ -203,6 +203,27 @@ class TestDocumentApi(DirectoriesMixin, DocumentConsumeDelayMixin, APITestCase):
self.assertEqual(response.status_code, status.HTTP_200_OK) self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertEqual(response.data["created"], "2023-01-01") self.assertEqual(response.data["created"], "2023-01-01")
# legacy datetime format
response = self.client.patch(
f"/api/documents/{doc.pk}/",
{"created": "2023-02-01T23:00:00Z"},
format="json",
)
self.assertEqual(response.status_code, status.HTTP_200_OK)
doc.refresh_from_db()
self.assertEqual(doc.created, date(2023, 2, 1))
# naive datetime
response = self.client.patch(
f"/api/documents/{doc.pk}/",
{"created": "2023-06-28T23:00:00"},
format="json",
)
self.assertEqual(response.status_code, status.HTTP_200_OK)
doc.refresh_from_db()
self.assertEqual(doc.created, date(2023, 6, 28))
def test_document_update_legacy_created_format(self): def test_document_update_legacy_created_format(self):
""" """
GIVEN: GIVEN:

View File

@ -2,7 +2,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: paperless-ngx\n" "Project-Id-Version: paperless-ngx\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2025-06-19 18:51+0000\n" "POT-Creation-Date: 2025-06-29 04:39+0000\n"
"PO-Revision-Date: 2022-02-17 04:17\n" "PO-Revision-Date: 2022-02-17 04:17\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: English\n" "Language-Team: English\n"
@ -1176,21 +1176,21 @@ msgstr ""
msgid "workflow runs" msgid "workflow runs"
msgstr "" msgstr ""
#: documents/serialisers.py:135 #: documents/serialisers.py:139
#, python-format #, python-format
msgid "Invalid regular expression: %(error)s" msgid "Invalid regular expression: %(error)s"
msgstr "" msgstr ""
#: documents/serialisers.py:561 #: documents/serialisers.py:565
msgid "Invalid color." msgid "Invalid color."
msgstr "" msgstr ""
#: documents/serialisers.py:1645 #: documents/serialisers.py:1649
#, python-format #, python-format
msgid "File type %(type)s not supported" msgid "File type %(type)s not supported"
msgstr "" msgstr ""
#: documents/serialisers.py:1739 #: documents/serialisers.py:1743
msgid "Invalid variable detected." msgid "Invalid variable detected."
msgstr "" msgstr ""