Changeset 6837

Timestamp:

12/02/07 12:14:11 (9 months ago)

Author:

jkocherhans

Message:

newforms-admin: Fixed #5828. You can leave inline add forms empty again. Thanks brosner.

Files:

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

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

@@ -183 +183 @@
-            if name in exceptions:
-                continue
-ictionary
+ata dictionaries
-            # Each widget type knows how to retrieve its own data, because some
-            # widgets split data over several HTML fields.
-            value = field.widget.value_from_datadict(self.data, self.files, self.add_prefix(name))
-
-
+
-                return False
-        return True

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

@@ -166 +166 @@
-        """
-        return data.get(name, None)
+    
+    def is_empty(self, value):
+        """
+        Given a dictionary of data and this widget's name, return True if the
+        widget data is empty or False when not empty.
+        """
+        if value not in (None, ''):
+            return False
+        return True
-
-    def id_for_label(self, id_):
@@ -302 +311 @@
-            return False
-        return super(CheckboxInput, self).value_from_datadict(data, files, name)
+    
+    def is_empty(self, value):
+        # this widget will always either be True or False, so always return the
+        # opposite value so False values will make the form empty
+        return not value
-
-class Select(Widget):
@@ -344 +358 @@
-        value = data.get(name, None)
-        return {u'2': True, u'3': False, True: True, False: False}.get(value, None)
+    
+    def is_empty(self, value):
+        # this widget will always either be True, False or None, so always
+        # return the opposite value so False and None values will make the
+        # form empty.
+        return not value
-
-class SelectMultiple(Widget):
@@ -540 +560 @@
-    def value_from_datadict(self, data, files, name):
-        return [widget.value_from_datadict(data, files, name + '_%s' % i) for i, widget in enumerate(self.widgets)]
+    
+    def is_empty(self, value):
+        for widget, val in zip(self.widgets, value):
+            if not widget.is_empty(val):
+                return False
+        return True
-
-    def format_output(self, rendered_widgets):

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

@@ -293 +293 @@
-False
-
+The CheckboxInput widget will always be empty when there is a False value
+>>> w.is_empty(False)
+True
+>>> w.is_empty(True)
+False
+
-# Select Widget ###############################################################
-
@@ -453 +459 @@
-<option value="3" selected="selected">No</option>
-</select>
+
+The NullBooleanSelect widget will always be empty when Unknown or No is selected
+as its value.  This is to stay compliant with the CheckboxInput behavior
+>>> w.is_empty(False)
+True
+>>> w.is_empty(None)
+True
+>>> w.is_empty(True)
+False
-
-""" + \
@@ -896 +911 @@
-u'<input id="bar_0" type="text" class="big" value="john" name="name_0" /><br /><input id="bar_1" type="text" class="small" value="lennon" name="name_1" />'
-
+The MultiWidget will be empty only when all widgets are considered empty.
+>>> w.is_empty(['john', 'lennon'])
+False
+>>> w.is_empty(['john', ''])
+False
+>>> w.is_empty(['', ''])
+True
+>>> w.is_empty([None, None])
+True
+
-# SplitDateTimeWidget #########################################################
-