Ticket #12749: t12749.draft-fix.diff

django/db/models/fields/related.py

@@ -824 +824 @@
     def validate(self, value, model_instance):
         if self.rel.parent_link:
             return
-        # Don't validate the field if a value wasn't supplied. This is
-        # generally the case when saving new inlines in the admin.
-        # See #12507.
-        if value is None:
-            return
         super(ForeignKey, self).validate(value, model_instance)
         if not value:
             return

django/forms/models.py

@@ -309 +309 @@
                 field_value = self.cleaned_data.get(field, None)
                 if not f.blank and not form_field.required and field_value in EMPTY_VALUES:
                     exclude.append(f.name)
+                elif isinstance(form_field, InlineForeignKeyField):
+                    # Don't validate the field if it is the inlined Foreign Key,
+                    # and we are saving a new object.
+                    # See #12507 and #12749.
+                    if self.instance.pk is None:
+                        exclude.append(f.name)
         return exclude
 
     def clean(self):
@@ -316 +322 @@
         return self.cleaned_data
 
     def _post_clean(self):
-        exclude = self._get_validation_exclusions()
         opts = self._meta
-
         # Update the model instance with self.cleaned_data.
         self.instance = construct_instance(self, self.instance, opts.fields, opts.exclude)
 
+        exclude = self._get_validation_exclusions()
+
         # Clean the model instance's fields.
         try:
             self.instance.clean_fields(exclude=exclude)
@@ -762 +768 @@
         unique_check = [field for field in unique_check if field != self.fk.name]
         return super(BaseInlineFormSet, self).get_unique_error_message(unique_check)
 
+
 def _get_foreign_key(parent_model, model, fk_name=None, can_fail=False):
     """
     Finds and returns the ForeignKey from model to parent if there is one

tests/regressiontests/admin_inlines/models.py

@@ -88 +88 @@
 # only Inline media
 admin.site.register(Holder3, inlines=[InnerInline3])
 
+# Models for #12749
+
+class Person(models.Model):
+    firstname = models.CharField(max_length=15)
+
+class OutfitItem(models.Model):
+    name = models.CharField(max_length=15)
+
+class Fashionista(models.Model):
+    person = models.OneToOneField(Person, primary_key=True)
+    weaknesses = models.ManyToManyField(OutfitItem, through='ShoppingWeakness', blank=True)
+
+class ShoppingWeakness(models.Model):
+    fashionista = models.ForeignKey(Fashionista)
+    item = models.ForeignKey(OutfitItem)
+
+class InlineWeakness(admin.TabularInline):
+    model = ShoppingWeakness
+    extra = 1
+
+admin.site.register(Fashionista, inlines=[InlineWeakness])
+
+
 __test__ = {'API_TESTS': """
 
 # Regression test for #9362

tests/regressiontests/admin_inlines/tests.py

@@ -3 +3 @@
 # local test models
 from models import Holder, Inner, InnerInline
 from models import Holder2, Inner2, Holder3, Inner3
-
+from models import Person, OutfitItem, Fashionista
 
 class TestInline(TestCase):
     fixtures = ['admin-views-users.xml']
@@ -38 +38 @@
                                    % holder.id)
         self.assertContains(response, '<label>Inner readonly label:</label>')
 
+    def test_inline_primary(self):
+        person = Person.objects.create(firstname='Imelda')
+        item = OutfitItem.objects.create(name='Shoes')
+        # Imelda likes shoes, but can't cary her own bags.
+        data = {
+            'shoppingweakness_set-TOTAL_FORMS': 1,
+            'shoppingweakness_set-INITIAL_FORMS': 0,
+            'shoppingweakness_set-MAX_NUM_FORMS': 0,
+            '_save': u'Save',
+            'person': person.id,
+            'max_weight': 0,
+            'shoppingweakness_set-0-item': item.id,
+        }
+        response = self.client.post('/test_admin/admin/admin_inlines/fashionista/add/', data)
+        self.assertEqual(response.status_code, 302)
+        self.assertEqual(len(Fashionista.objects.filter(person__firstname='Imelda')), 1)
 
 class TestInlineMedia(TestCase):
     fixtures = ['admin-views-users.xml']