Ticket #9161: 9161-against-9072.diff

django/forms/models.py

@@ -664 +664 @@
 
     def __init__(self, queryset, cache_choices=False, required=True,
                  widget=None, label=None, initial=None,
-                 help_text=None, *args, **kwargs):
+                 help_text=None, to_field_name=None, *args, **kwargs):
         super(ModelMultipleChoiceField, self).__init__(queryset, None,
             cache_choices, required, widget, label, initial, help_text,
-            *args, **kwargs)
+            to_field_name, *args, **kwargs)
 
     def clean(self, value):
         if self.required and not value:
@@ -679 +679 @@
         final_values = []
         for val in value:
             try:
-                obj = self.queryset.get(pk=val)
+                key = self.to_field_name or 'pk'
+                obj = self.queryset.get(**{key: val})
             except self.queryset.model.DoesNotExist:
                 raise ValidationError(self.error_messages['invalid_choice'] % val)
             else:

tests/modeltests/model_forms/models.py

@@ -1232 +1232 @@
 (86, u'Apple')
 (22, u'Pear')
 (87, u'Core')
+>>> field.clean(u'87')
+<Inventory: Core>
+
+>>> 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([u'86',u'22'])
+[<Inventory: Apple>, <Inventory: Pear>]
 
 >>> class InventoryForm(ModelForm):
 ...     class Meta: