From ab043ff4e8ad0bc6f0f2c1483333a428fc714a6f Mon Sep 17 00:00:00 2001 From: Elisabeth Heinrich-Josties Date: Fri, 26 Jul 2019 19:15:17 +0000 Subject: [PATCH] Get additional formats from the DateTimeField input formats, they are the same formats as DATETIME_INPUT_FORMATS but its a bit more clear --- observation_portal/common/mixins.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/observation_portal/common/mixins.py b/observation_portal/common/mixins.py index 1538a67d..98aa69e7 100644 --- a/observation_portal/common/mixins.py +++ b/observation_portal/common/mixins.py @@ -1,6 +1,6 @@ from django_filters import fields, IsoDateTimeFilter from django.contrib.auth.mixins import UserPassesTestMixin -from django.utils import formats +from django.forms import DateTimeField class ListAsDictMixin(object): @@ -28,9 +28,8 @@ def test_func(self): # Use the CustomIsoDateTimeFilterMixin in a FilterSet. Makes all IsoDateTimeFilters within the FilterSet able to parse # ISO 8601 datetimes, as well as all the other usual formats that the DateTimeFilter can do. # https://django-filter.readthedocs.io/en/master/ref/fields.html#isodatetimefield - class CustomIsoDateTimeField(fields.IsoDateTimeField): - input_formats = [fields.IsoDateTimeField.ISO_8601] + list(formats.get_format_lazy('DATETIME_INPUT_FORMATS')) + input_formats = [fields.IsoDateTimeField.ISO_8601] + list(DateTimeField.input_formats) class CustomIsoDateTimeFilterMixin(object):