Fixed #9651: fixed save_as with inline forms. Thanks, kmike and Mnewman.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10353 bcc190cf-cafb-0310-a4f2-bffc1f526a37

django/forms/models.py

@@ -530,6 +530,9 @@ class BaseInlineFormSet(BaseModelFormSet):
             # Remove the primary key from the form's data, we are only
             # creating new instances
             form.data[form.add_prefix(self._pk_field.name)] = None
+
+            # Remove the foreign key from the form's data
+            form.data[form.add_prefix(self.fk.name)] = None
         return form
 
     #@classmethod

tests/regressiontests/admin_views/models.py

@@ -287,7 +287,7 @@ class EmptyModelAdmin(admin.ModelAdmin):
 
 admin.site.register(Article, ArticleAdmin)
 admin.site.register(CustomArticle, CustomArticleAdmin)
-admin.site.register(Section, inlines=[ArticleInline])
+admin.site.register(Section, save_as=True, inlines=[ArticleInline])
 admin.site.register(ModelWithStringPrimaryKey)
 admin.site.register(Color)
 admin.site.register(Thing, ThingAdmin)

tests/regressiontests/admin_views/tests.py

@@ -78,22 +78,19 @@ class AdminViewBasicTest(TestCase):
         response = self.client.post('/test_admin/%s/admin_views/section/add/' % self.urlbit, post_data)
         self.failUnlessEqual(response.status_code, 302) # redirect somewhere
 
-    def testBasicEditPost(self):
+    # Post data for edit inline
-        """
+    inline_post_data = {
-        A smoke test to ensure POST on edit_view works.
-        """
-        post_data = {
         "name": u"Test section",
         # inline data
         "article_set-TOTAL_FORMS": u"6",
         "article_set-INITIAL_FORMS": u"3",
         "article_set-0-id": u"1",
-            # there is no title in database, give one here or formset
+        # there is no title in database, give one here or formset will fail.
-            # will fail.
         "article_set-0-title": u"Norske bostaver æøå skaper problemer",
         "article_set-0-content": u"<p>Middle content</p>",
         "article_set-0-date_0": u"2008-03-18",
         "article_set-0-date_1": u"11:54:58",
+        "article_set-0-section": u"1",
         "article_set-1-id": u"2",
         "article_set-1-title": u"Need a title.",
         "article_set-1-content": u"<p>Oldest content</p>",
@@ -120,6 +117,27 @@ class AdminViewBasicTest(TestCase):
         "article_set-5-date_0": u"",
         "article_set-5-date_1": u"",
     }
+
+    def testBasicEditPost(self):
+        """
+        A smoke test to ensure POST on edit_view works.
+        """
+        response = self.client.post('/test_admin/%s/admin_views/section/1/' % self.urlbit, self.inline_post_data)
+        self.failUnlessEqual(response.status_code, 302) # redirect somewhere
+
+    def testEditSaveAs(self):
+        """
+        Test "save as".
+        """
+        post_data = self.inline_post_data.copy()
+        post_data.update({
+            '_saveasnew': u'Save+as+new',
+            "article_set-1-section": u"1",
+            "article_set-2-section": u"1",
+            "article_set-3-section": u"1",
+            "article_set-4-section": u"1",
+            "article_set-5-section": u"1",
+        })
         response = self.client.post('/test_admin/%s/admin_views/section/1/' % self.urlbit, post_data)
         self.failUnlessEqual(response.status_code, 302) # redirect somewhere