From 9d9a9d850c57f4ae38c81a97a5a906830308db94 Mon Sep 17 00:00:00 2001 From: Jakub Zalas Date: Mon, 3 Nov 2014 20:55:11 +0000 Subject: [PATCH 1/3] Remove no longer supported model_timezone and view_timezone options in date and time types. --- reference/forms/types/date.rst | 6 ------ reference/forms/types/time.rst | 6 ------ 2 files changed, 12 deletions(-) diff --git a/reference/forms/types/date.rst b/reference/forms/types/date.rst index 994ff6156b3..76d603cb38e 100644 --- a/reference/forms/types/date.rst +++ b/reference/forms/types/date.rst @@ -23,9 +23,7 @@ day, and year) or three select boxes (see the `widget`_ option). | | - `empty_value`_ | | | - `format`_ | | | - `input`_ | -| | - `model_timezone`_ | | | - `months`_ | -| | - `view_timezone`_ | | | - `widget`_ | | | - `years`_ | +----------------------+-----------------------------------------------------------------------------+ @@ -109,12 +107,8 @@ Alternatively, you can specify a string to be displayed for the "blank" value:: .. include:: /reference/forms/types/options/date_input.rst.inc -.. include:: /reference/forms/types/options/model_timezone.rst.inc - .. include:: /reference/forms/types/options/months.rst.inc -.. include:: /reference/forms/types/options/view_timezone.rst.inc - .. include:: /reference/forms/types/options/date_widget.rst.inc .. include:: /reference/forms/types/options/years.rst.inc diff --git a/reference/forms/types/time.rst b/reference/forms/types/time.rst index 71b3af1cdb5..c3c0977cc85 100644 --- a/reference/forms/types/time.rst +++ b/reference/forms/types/time.rst @@ -19,9 +19,7 @@ as a ``DateTime`` object, a string, a timestamp or an array. | | - `hours`_ | | | - `input`_ | | | - `minutes`_ | -| | - `model_timezone`_ | | | - `seconds`_ | -| | - `view_timezone`_ | | | - `widget`_ | | | - `with_minutes`_ | | | - `with_seconds`_ | @@ -99,12 +97,8 @@ this format. .. include:: /reference/forms/types/options/minutes.rst.inc -.. include:: /reference/forms/types/options/model_timezone.rst.inc - .. include:: /reference/forms/types/options/seconds.rst.inc -.. include:: /reference/forms/types/options/view_timezone.rst.inc - widget ~~~~~~ From 9d35c69ce302ed57444251fd4c624f6f1964a9de Mon Sep 17 00:00:00 2001 From: Jakub Zalas Date: Mon, 3 Nov 2014 20:55:34 +0000 Subject: [PATCH 2/3] Warn users that only relevant parts of DateTime object are used. --- reference/forms/types/date.rst | 5 +++++ reference/forms/types/time.rst | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/reference/forms/types/date.rst b/reference/forms/types/date.rst index 76d603cb38e..42ab095cdbd 100644 --- a/reference/forms/types/date.rst +++ b/reference/forms/types/date.rst @@ -11,6 +11,11 @@ The underlying data used for this field type can be a ``DateTime`` object, a string, a timestamp or an array. As long as the `input`_ option is set correctly, the field will take care of all of the details. +.. note:: + + In case of ``DateTime`` the timezone is ignored. + Only year, month and day are used. + The field can be rendered as a single text box, three text boxes (month, day, and year) or three select boxes (see the `widget`_ option). diff --git a/reference/forms/types/time.rst b/reference/forms/types/time.rst index c3c0977cc85..0126934360e 100644 --- a/reference/forms/types/time.rst +++ b/reference/forms/types/time.rst @@ -10,6 +10,11 @@ This can be rendered as a text field, a series of text fields (e.g. hour, minute, second) or a series of select fields. The underlying data can be stored as a ``DateTime`` object, a string, a timestamp or an array. +.. note:: + + In case of ``DateTime`` the timezone is ignored. + Only hour, minutes and seconds are used. + +----------------------+-----------------------------------------------------------------------------+ | Underlying Data Type | can be ``DateTime``, string, timestamp, or array (see the ``input`` option) | +----------------------+-----------------------------------------------------------------------------+ From 513c4401d8b483fb4b21b5c7ea0a4aeac0117d22 Mon Sep 17 00:00:00 2001 From: Jakub Zalas Date: Mon, 3 Nov 2014 22:40:41 +0000 Subject: [PATCH 3/3] Remove no longer supported model_timezone and view_timezone options in the birthday type. --- reference/forms/types/birthday.rst | 6 ------ 1 file changed, 6 deletions(-) diff --git a/reference/forms/types/birthday.rst b/reference/forms/types/birthday.rst index d77551c3b29..d47aa02b6f5 100644 --- a/reference/forms/types/birthday.rst +++ b/reference/forms/types/birthday.rst @@ -28,9 +28,7 @@ option defaults to 120 years ago to the current year. | | - `empty_value`_ | | | - `format`_ | | | - `input`_ | -| | - `model_timezone`_ | | | - `months`_ | -| | - `view_timezone`_ | | | - `widget`_ | | | | | | from the :doc:`form ` type: | @@ -72,12 +70,8 @@ These options inherit from the :doc:`date ` type: .. include:: /reference/forms/types/options/date_input.rst.inc -.. include:: /reference/forms/types/options/model_timezone.rst.inc - .. include:: /reference/forms/types/options/months.rst.inc -.. include:: /reference/forms/types/options/view_timezone.rst.inc - .. include:: /reference/forms/types/options/date_widget.rst.inc These options inherit from the :doc:`form ` type: