Changeset 4547

Timestamp:

02/19/07 20:42:07 (2 years ago)

Author:

adrian

Message:

Fixed #3257 -- Added newforms ModelChoiceField? and ModelMultipleChoiceField?, which are now used by form_for_model() and form_for_instance(). Thanks for the patch, Honza Kral, floguy@gmail.com and kilian.cavalotti

Files:

• django/trunk/django/db/models/fields/related.py (modified) (3 diffs)
• django/trunk/django/newforms/models.py (modified) (3 diffs)
• django/trunk/tests/modeltests/model_forms/models.py (modified) (1 diff)

django/trunk/django/db/models/fields/related.py

@@ -554 +554 @@
-
-    def formfield(self, **kwargs):
-choices': self.get_choices_default
+queryset': self.rel.to._default_manager.all
-        defaults.update(kwargs)
-
+Model
-
-class OneToOneField(RelatedField, IntegerField):
@@ -620 +620 @@
-
-    def formfield(self, **kwargs):
-choices': self.get_choices_default
+queryset': self.rel.to._default_manager.all
-        defaults.update(kwargs)
-
+Model
-
-class ManyToManyField(RelatedField, Field):
@@ -743 +743 @@
-        if kwargs.get('initial') is not None:
-            kwargs['initial'] = [i._get_pk_val() for i in kwargs['initial']]
-choices': self.get_choices_default
+queryset' : self.rel.to._default_manager.all
-        defaults.update(kwargs)
-
+odelM
-
-class ManyToOneRel(object):

django/trunk/django/newforms/models.py

@@ -5 +5 @@
-
-from forms import BaseForm, DeclarativeFieldsMetaclass, SortedDictFromList
+from fields import ChoiceField, MultipleChoiceField
+from widgets import Select, SelectMultiple
-
-
+
+
-
-def model_save(self, commit=True):
@@ -34 +37 @@
-        if isinstance(f, models.AutoField):
-            continue
-att
+
-    if commit:
-        instance.save()
@@ -97 +100 @@
-    fields = SortedDictFromList([(f.name, f.formfield()) for f in field_list])
-    return type('FormForFields', (BaseForm,), {'base_fields': fields})
+
+class ModelChoiceField(ChoiceField):
+    "A ChoiceField whose choices are a model QuerySet."
+    def __init__(self, queryset, empty_label=u"---------", **kwargs):
+        self.model = queryset.model
+        choices = [(obj._get_pk_val(), str(obj)) for obj in queryset]
+        if empty_label is not None:
+            choices = [(u"", empty_label)] + choices
+        ChoiceField.__init__(self, choices=choices, **kwargs)
+
+    def clean(self, value):
+        value = ChoiceField.clean(self, value)
+        if not value:
+            return None
+        try:
+            value = self.model._default_manager.get(pk=value)
+        except self.model.DoesNotExist:
+            raise ValidationError(gettext(u'Select a valid choice. That choice is not one of the available choices.'))
+        return value
+
+class ModelMultipleChoiceField(MultipleChoiceField):
+    "A MultipleChoiceField whose choices are a model QuerySet."
+    def __init__(self, queryset, **kwargs):
+        self.model = queryset.model
+        MultipleChoiceField.__init__(self, choices=[(obj._get_pk_val(), str(obj)) for obj in queryset], **kwargs)
+
+    def clean(self, value):
+        value = MultipleChoiceField.clean(self, value)
+        if not value:
+            return []
+        return self.model._default_manager.filter(pk__in=value)

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

@@ -282 +282 @@
->>> Category.objects.get(id=3)
-<Category: Third>
+
+# ModelChoiceField ############################################################
+
+>>> from django.newforms import ModelChoiceField, ModelMultipleChoiceField
+
+>>> f = ModelChoiceField(Category.objects.all())
+>>> f.clean('')
+Traceback (most recent call last):
+...
+ValidationError: [u'This field is required.']
+>>> f.clean(None)
+Traceback (most recent call last):
+...
+ValidationError: [u'This field is required.']
+>>> f.clean(0)
+Traceback (most recent call last):
+...
+ValidationError: [u'Select a valid choice. That choice is not one of the available choices.']
+>>> f.clean(3)
+<Category: Third>
+>>> f.clean(2)
+<Category: It's a test>
+
+>>> f = ModelChoiceField(Category.objects.filter(pk=1), required=False)
+>>> print f.clean('')
+None
+>>> f.clean('')
+>>> f.clean('1')
+<Category: Entertainment>
+>>> f.clean('2')
+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())
+>>> f.clean(None)
+Traceback (most recent call last):
+...
+ValidationError: [u'This field is required.']
+>>> f.clean([])
+Traceback (most recent call last):
+...
+ValidationError: [u'This field is required.']
+>>> f.clean([1])
+[<Category: Entertainment>]
+>>> f.clean([2])
+[<Category: It's a test>]
+>>> f.clean(['1'])
+[<Category: Entertainment>]
+>>> f.clean(['1', '2'])
+[<Category: Entertainment>, <Category: It's a test>]
+>>> f.clean([1, '2'])
+[<Category: Entertainment>, <Category: It's a test>]
+>>> f.clean((1, '2'))
+[<Category: Entertainment>, <Category: It's a test>]
+>>> f.clean(['nonexistent'])
+Traceback (most recent call last):
+...
+ValidationError: [u'Select a valid choice. nonexistent is not one of the available choices.']
+>>> f.clean('hello')
+Traceback (most recent call last):
+...
+ValidationError: [u'Enter a list of values.']
+>>> f = ModelMultipleChoiceField(Category.objects.all(), required=False)
+>>> f.clean([])
+[]
+>>> f.clean(())
+[]
+>>> 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.']
+>>> f.clean(['1', '5'])
+Traceback (most recent call last):
+...
+ValidationError: [u'Select a valid choice. 5 is not one of the available choices.']
-"""}