Changeset 6670

Timestamp:

11/13/07 08:36:29 (8 months ago)

Author:

gwilson

Message:

Fixed #4787, #5913 -- Updating the queryset on a ModelChoiceField or ModelMultipleChoiceField now updates its widget's choices. The clean methods for ModelChoiceField and ModelMultipleChoiceField were changed to only allow choices in the specified queryset (instead of allowing all choices returned by the queryset model's default manager).

Files:

• django/trunk/django/newforms/models.py (modified) (4 diffs)
• django/trunk/tests/modeltests/model_forms/models.py (modified) (3 diffs)

django/trunk/django/newforms/models.py

@@ -156 +156 @@
-                 required=True, widget=Select, label=None, initial=None,
-                 help_text=None):
-        self.queryset = queryset
-        self.empty_label = empty_label
-        self.cache_choices = cache_choices
@@ -162 +161 @@
-        # ChoiceField.__init__().
-        Field.__init__(self, required, widget, label, initial, help_text)
+        self.queryset = queryset
+
+    def _get_queryset(self):
+        return self._queryset
+
+    def _set_queryset(self, queryset):
+        self._queryset = queryset
-        self.widget.choices = self.choices
+
+    queryset = property(_get_queryset, _set_queryset)
-
-    def _get_choices(self):
@@ -191 +199 @@
-            return None
-        try:
-model._default_manager.
+
-        except self.queryset.model.DoesNotExist:
-            raise ValidationError(ugettext(u'Select a valid choice. That'
@@ -218 +226 @@
-        for val in value:
-            try:
-model._default_manager.
+
-            except self.queryset.model.DoesNotExist:
-                raise ValidationError(ugettext(u'Select a valid choice. %s is'

django/trunk/tests/modeltests/model_forms/models.py

@@ -441 +441 @@
-
->>> f = ModelChoiceField(Category.objects.all())
+>>> list(f.choices)
+[(u'', u'---------'), (1, u'Entertainment'), (2, u"It's a test"), (3, u'Third'), (4, u'Fourth')]
->>> f.clean('')
-Traceback (most recent call last):
@@ -486 +488 @@
-ValidationError: [u'Select a valid choice. That choice is not one of the available choices.']
-
+# queryset can be changed after the field is created.
+>>> f.queryset = Category.objects.exclude(name='Fourth')
+>>> list(f.choices)
+[(u'', u'---------'), (1, u'Entertainment'), (2, u"It's a test"), (3, u'Third')]
+>>> f.clean(3)
+<Category: Third>
+>>> f.clean(4)
+Traceback (most recent call last):
+...
+ValidationError: [u'Select a valid choice. That choice is not one of the available choices.']
+
+
-# ModelMultipleChoiceField ####################################################
-
->>> f = ModelMultipleChoiceField(Category.objects.all())
+>>> list(f.choices)
+[(1, u'Entertainment'), (2, u"It's a test"), (3, u'Third'), (4, u'Fourth')]
->>> f.clean(None)
-Traceback (most recent call last):
@@ -553 +569 @@
-ValidationError: [u'Select a valid choice. 10 is not one of the available choices.']
-
+# queryset can be changed after the field is created.
+>>> f.queryset = Category.objects.exclude(name='Fourth')
+>>> list(f.choices)
+[(1, u'Entertainment'), (2, u"It's a test"), (3, u'Third')]
+>>> f.clean([3])
+[<Category: Third>]
+>>> f.clean([4])
+Traceback (most recent call last):
+...
+ValidationError: [u'Select a valid choice. 4 is not one of the available choices.']
+>>> f.clean(['3', '4'])
+Traceback (most recent call last):
+...
+ValidationError: [u'Select a valid choice. 4 is not one of the available choices.']
+
+
-# PhoneNumberField ############################################################
-