Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[1.1.X] Fixed #12858. DateTime related widgets now handle custom form…

…ats properly in _has_changed. Backport of r12698 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12699 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 72a659f8f83f1875739cf79a390917ad7a3d384c 1 parent e8c7689
@jkocherhans jkocherhans authored
Showing with 54 additions and 1 deletion.
  1. +26 −1 django/forms/widgets.py
  2. +28 −0 tests/regressiontests/forms/widgets.py
View
27 django/forms/widgets.py
@@ -16,7 +16,8 @@
from django.utils.encoding import StrAndUnicode, force_unicode
from django.utils.safestring import mark_safe
from django.utils import datetime_safe
-from datetime import time
+import time
+import datetime
from util import flatatt
from urlparse import urljoin
@@ -319,6 +320,14 @@ def render(self, name, value, attrs=None):
return super(DateInput, self).render(name, value, attrs)
def _has_changed(self, initial, data):
+ # If our field has show_hidden_initial=True, initial will be a string
+ # formatted by HiddenInput using formats.localize_input, which is not
+ # necessarily the format used for this widget. Attempt to convert it.
+ try:
+ input_format = '%Y-%m-%d'
+ initial = datetime.date(*time.strptime(initial, '%Y-%m-%d')[:3])
+ except (TypeError, ValueError):
+ pass
return super(DateInput, self)._has_changed(self._format_value(initial), data)
class DateTimeInput(Input):
@@ -343,6 +352,14 @@ def render(self, name, value, attrs=None):
return super(DateTimeInput, self).render(name, value, attrs)
def _has_changed(self, initial, data):
+ # If our field has show_hidden_initial=True, initial will be a string
+ # formatted by HiddenInput using formats.localize_input, which is not
+ # necessarily the format used for this widget. Attempt to convert it.
+ try:
+ input_format = '%Y-%m-%d %H:%M:%S'
+ initial = datetime.datetime(*time.strptime(initial, input_format)[:6])
+ except (TypeError, ValueError):
+ pass
return super(DateTimeInput, self)._has_changed(self._format_value(initial), data)
class TimeInput(Input):
@@ -366,6 +383,14 @@ def render(self, name, value, attrs=None):
return super(TimeInput, self).render(name, value, attrs)
def _has_changed(self, initial, data):
+ # If our field has show_hidden_initial=True, initial will be a string
+ # formatted by HiddenInput using formats.localize_input, which is not
+ # necessarily the format used for this widget. Attempt to convert it.
+ try:
+ input_format = '%H:%M:%S'
+ initial = datetime.time(*time.strptime(initial, input_format)[3:6])
+ except (TypeError, ValueError):
+ pass
return super(TimeInput, self)._has_changed(self._format_value(initial), data)
class CheckboxInput(Widget):
View
28 tests/regressiontests/forms/widgets.py
@@ -3,6 +3,7 @@
>>> from django.forms import *
>>> from django.forms.widgets import RadioFieldRenderer
>>> from django.utils.safestring import mark_safe
+>>> from django.utils.encoding import force_unicode
>>> import datetime
>>> import time
>>> import re
@@ -1134,6 +1135,15 @@
>>> w._has_changed(d, '17/09/2007 12:51')
False
+Make sure a custom format works with _has_changed. The hidden input will use
+force_unicode to display the initial value.
+>>> data = datetime.datetime(2010, 3, 6, 12, 0, 0)
+>>> custom_format = '%d.%m.%Y %H:%M'
+>>> w = DateTimeInput(format=custom_format)
+>>> w._has_changed(force_unicode(data), data.strftime(custom_format))
+False
+
+
# DateInput ###################################################################
>>> w = DateInput()
@@ -1159,6 +1169,15 @@
>>> w._has_changed(d, '17/09/2007')
False
+Make sure a custom format works with _has_changed. The hidden input will use
+force_unicode to display the initial value.
+>>> data = datetime.date(2010, 3, 6)
+>>> custom_format = '%d.%m.%Y'
+>>> w = DateInput(format=custom_format)
+>>> w._has_changed(force_unicode(data), data.strftime(custom_format))
+False
+
+
# TimeInput ###################################################################
>>> w = TimeInput()
@@ -1187,6 +1206,15 @@
>>> w._has_changed(t, '12:51')
False
+Make sure a custom format works with _has_changed. The hidden input will use
+force_unicode to display the initial value.
+>>> data = datetime.time(13, 0)
+>>> custom_format = '%I:%M %p'
+>>> w = TimeInput(format=custom_format)
+>>> w._has_changed(force_unicode(data), data.strftime(custom_format))
+False
+
+
# SplitHiddenDateTimeWidget ###################################################
>>> from django.forms.widgets import SplitHiddenDateTimeWidget
Please sign in to comment.
Something went wrong with that request. Please try again.