diff --git a/django/forms/models.py b/django/forms/models.py index 2a3f8bdff2..912bdf36a8 100644 --- a/django/forms/models.py +++ b/django/forms/models.py @@ -1006,13 +1006,14 @@ class ModelMultipleChoiceField(ModelChoiceField): return [] if not isinstance(value, (list, tuple)): raise ValidationError(self.error_messages['list']) + key = self.to_field_name or 'pk' for pk in value: try: - self.queryset.filter(pk=pk) + self.queryset.filter(**{key: pk}) except ValueError: raise ValidationError(self.error_messages['invalid_pk_value'] % pk) - qs = self.queryset.filter(pk__in=value) - pks = set([force_unicode(o.pk) for o in qs]) + qs = self.queryset.filter(**{'%s__in' % key: value}) + pks = set([force_unicode(getattr(o, key)) for o in qs]) for val in value: if force_unicode(val) not in pks: raise ValidationError(self.error_messages['invalid_choice'] % val) diff --git a/tests/modeltests/model_forms/models.py b/tests/modeltests/model_forms/models.py index b9b8d16c07..2e820a6779 100644 --- a/tests/modeltests/model_forms/models.py +++ b/tests/modeltests/model_forms/models.py @@ -1562,6 +1562,25 @@ ValidationError: [u'Select a valid choice. z is not one of the available choices +# to_field_name should also work on ModelMultipleChoiceField ################## + +>>> field = ModelMultipleChoiceField(Inventory.objects.all(), to_field_name='barcode') +>>> for choice in field.choices: +... print choice +(86, u'Apple') +(22, u'Pear') +(87, u'Core') +>>> field.clean([86]) +[] + +>>> class SelectInventoryForm(forms.Form): +... items = ModelMultipleChoiceField(Inventory.objects.all(), to_field_name='barcode') +>>> form = SelectInventoryForm({'items': [87, 22]}) +>>> form.is_valid() +True +>>> form.cleaned_data +{'items': [, ]} + # Model field that returns None to exclude itself with explicit fields ######## >>> class CustomFieldForExclusionForm(ModelForm):