Changeset 7366

Timestamp:

03/26/08 23:20:21 (3 months ago)

Author:

brosner

Message:

newforms-admin: Changed Widget._has_changed to *only* use an empty string when data and/or initial is None. False values were tripping up the conditional.

Files:

• django/branches/newforms-admin/django/newforms/forms.py (modified) (1 diff)
• django/branches/newforms-admin/django/newforms/widgets.py (modified) (1 diff)
• django/branches/newforms-admin/tests/regressiontests/forms/forms.py (modified) (1 diff)

django/branches/newforms-admin/django/newforms/forms.py

@@ -255 +255 @@
-            initial_value = self.initial.get(name, field.initial)
-            if field.widget._has_changed(initial_value, data_value):
-                #print field
-                return True
-        return False

django/branches/newforms-admin/django/newforms/widgets.py

@@ -173 +173 @@
-        # the same as an empty string, if the data or inital value we get
-        # is None, replace it w/ u''.
-
-
+
+
+
+
+
+
+
+
-        if force_unicode(initial_value) != force_unicode(data_value):
-            return True

django/branches/newforms-admin/tests/regressiontests/forms/forms.py

@@ -1718 +1718 @@
-AttributeError: 'SongForm' object has no attribute 'cleaned_data'
-
+If a field is not given in the data then None is returned for its data. Lets
+make sure that when checking for empty_permitted that None is treated
+accordingly.
+
+>>> data = {'artist': None, 'song': ''}
+>>> form = SongForm(data, empty_permitted=True)
+>>> form.is_valid()
+True
+
+However, we *really* need to be sure we are checking for None as any data in
+initial that returns False on a boolean call needs to be treated literally.
+
+>>> class PriceForm(Form):
+...     amount = FloatField()
+...     qty = IntegerField()
+
+>>> data = {'amount': '0.0', 'qty': ''}
+>>> form = PriceForm(data, initial={'amount': 0.0}, empty_permitted=True)
+>>> form.is_valid()
+True
+
-"""