Commit b4435600 by Tom Christie

Fix DATETIME_FORMAT, DATE_FORMAT, TIME_FORMAT settings. Closes #798

parent de69a28b
...@@ -203,7 +203,7 @@ A format string that should be used by default for rendering the output of `Date ...@@ -203,7 +203,7 @@ A format string that should be used by default for rendering the output of `Date
May be any of `None`, `'iso-8601'` or a python [strftime format][strftime] string. May be any of `None`, `'iso-8601'` or a python [strftime format][strftime] string.
Default: `None'` Default: `None`
#### DATETIME_INPUT_FORMATS #### DATETIME_INPUT_FORMATS
......
...@@ -500,7 +500,7 @@ class DateField(WritableField): ...@@ -500,7 +500,7 @@ class DateField(WritableField):
} }
empty = None empty = None
input_formats = api_settings.DATE_INPUT_FORMATS input_formats = api_settings.DATE_INPUT_FORMATS
format = None format = api_settings.DATE_FORMAT
def __init__(self, input_formats=None, format=None, *args, **kwargs): def __init__(self, input_formats=None, format=None, *args, **kwargs):
self.input_formats = input_formats if input_formats is not None else self.input_formats self.input_formats = input_formats if input_formats is not None else self.input_formats
...@@ -563,7 +563,7 @@ class DateTimeField(WritableField): ...@@ -563,7 +563,7 @@ class DateTimeField(WritableField):
} }
empty = None empty = None
input_formats = api_settings.DATETIME_INPUT_FORMATS input_formats = api_settings.DATETIME_INPUT_FORMATS
format = None format = api_settings.DATETIME_FORMAT
def __init__(self, input_formats=None, format=None, *args, **kwargs): def __init__(self, input_formats=None, format=None, *args, **kwargs):
self.input_formats = input_formats if input_formats is not None else self.input_formats self.input_formats = input_formats if input_formats is not None else self.input_formats
...@@ -632,7 +632,7 @@ class TimeField(WritableField): ...@@ -632,7 +632,7 @@ class TimeField(WritableField):
} }
empty = None empty = None
input_formats = api_settings.TIME_INPUT_FORMATS input_formats = api_settings.TIME_INPUT_FORMATS
format = None format = api_settings.TIME_FORMAT
def __init__(self, input_formats=None, format=None, *args, **kwargs): def __init__(self, input_formats=None, format=None, *args, **kwargs):
self.input_formats = input_formats if input_formats is not None else self.input_formats self.input_formats = input_formats if input_formats is not None else self.input_formats
......
...@@ -86,17 +86,17 @@ DEFAULTS = { ...@@ -86,17 +86,17 @@ DEFAULTS = {
'DATE_INPUT_FORMATS': ( 'DATE_INPUT_FORMATS': (
ISO_8601, ISO_8601,
), ),
'DATE_FORMAT': ISO_8601, 'DATE_FORMAT': None,
'DATETIME_INPUT_FORMATS': ( 'DATETIME_INPUT_FORMATS': (
ISO_8601, ISO_8601,
), ),
'DATETIME_FORMAT': ISO_8601, 'DATETIME_FORMAT': None,
'TIME_INPUT_FORMATS': ( 'TIME_INPUT_FORMATS': (
ISO_8601, ISO_8601,
), ),
'TIME_FORMAT': ISO_8601, 'TIME_FORMAT': None,
# Pending deprecation # Pending deprecation
'FILTER_BACKEND': None, 'FILTER_BACKEND': None,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment