Ticket #17657: issue17657.diff

django/forms/models.py

@@ -124 +124 @@
             if instance.pk is None:
                 data[f.name] = []
             else:
-                # MultipleChoiceWidget needs a list of pks, not object instances.
-                data[f.name] = [obj.pk for obj in f.value_from_object(instance)]
+                data[f.name] = list(f.value_from_object(instance))
         else:
             data[f.name] = f.value_from_object(instance)
     return data

tests/regressiontests/forms/tests/__init__.py

@@ -13 +13 @@
     CustomDateTimeInputFormatsTests, SimpleDateTimeFormatTests)
 from .media import FormsMediaTestCase, StaticFormsMediaTestCase
 from .models import (TestTicket12510, ModelFormCallableModelDefault,
-    FormsModelTestCase, RelatedModelFormTests)
+    FormsModelTestCase, RelatedModelFormTests,
+    MultipleChoiceWithFieldName)
 from .regressions import FormsRegressionsTestCase
 from .util import FormsUtilTestCase
 from .validators import TestFieldWithValidators

tests/regressiontests/forms/tests/models.py

@@ -5 +5 @@
 
 from django.core.files.uploadedfile import SimpleUploadedFile
 from django.db import models
-from django.forms import Form, ModelForm, FileField, ModelChoiceField
+from django.forms import Form, ModelForm, FileField, ModelChoiceField, ModelMultipleChoiceField
 from django.forms.models import ModelFormMetaclass
 from django.test import TestCase
 
@@ -18 +18 @@
         model = ChoiceFieldModel
 
 
+class ChoiceFieldFormWithFieldName(ModelForm):
+
+    multi_choice = ModelMultipleChoiceField(ChoiceOptionModel.objects.all(),
+                                            to_field_name="name")
+
+    class Meta:
+        model = ChoiceFieldModel
+
+
 class FileForm(Form):
     file1 = FileField()
 
@@ -196 +205 @@
             model=A
 
         self.assertTrue(issubclass(ModelFormMetaclass('Form', (ModelForm,), {'Meta': Meta}), ModelForm))
+
+class MultipleChoiceWithFieldName(TestCase):
+
+    def test_to_field_name(self):
+        """
+        Test for issue 17657
+        """
+        obj1 = ChoiceOptionModel.objects.create(id=1, name='default')
+        obj2 = ChoiceOptionModel.objects.create(id=2, name='option 2')
+        obj3 = ChoiceOptionModel.objects.create(id=3, name='option 3')
+        instance = ChoiceFieldModel.objects.create()
+
+        instance.multi_choice.add(obj2, obj3)
+
+        form = ChoiceFieldFormWithFieldName(instance=instance)
+
+        self.assertHTMLEqual(
+            str(form["multi_choice"]), """<select multiple="multiple" name="multi_choice" id="id_multi_choice">
+<option value="default">ChoiceOption 1</option>
+<option value="option 2" selected="selected">ChoiceOption 2</option>
+<option value="option 3" selected="selected">ChoiceOption 3</option>
+</select>""")