Ticket #9651: 9651-r10336.diff

django/forms/models.py

@@ -530 +530 @@
             # 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/tests.py

@@ -94 +94 @@
             "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>",
             "article_set-1-date_0": u"2000-03-18",
             "article_set-1-date_1": u"11:54:58",
+            "article_set-1-section": u"1",
             "article_set-2-id": u"3",
             "article_set-2-title": u"Need a title.",
             "article_set-2-content": u"<p>Newest content</p>",
             "article_set-2-date_0": u"2009-03-18",
             "article_set-2-date_1": u"11:54:58",
+            "article_set-2-section": u"1",
             "article_set-3-id": u"",
             "article_set-3-title": u"",
             "article_set-3-content": u"",
             "article_set-3-date_0": u"",
             "article_set-3-date_1": u"",
+            "article_set-3-section": u"1",
             "article_set-4-id": u"",
             "article_set-4-title": u"",
             "article_set-4-content": u"",
             "article_set-4-date_0": u"",
             "article_set-4-date_1": u"",
+            "article_set-4-section": u"1",
             "article_set-5-id": u"",
             "article_set-5-title": u"",
             "article_set-5-content": u"",
             "article_set-5-date_0": u"",
             "article_set-5-date_1": u"",
+            "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
 
+        # test save_as
+        post_data.update({'_saveasnew': u'Save+as+new',})
+        response = self.client.post('/test_admin/%s/admin_views/section/1/' % self.urlbit, post_data)
+        self.failUnlessEqual(response.status_code, 302) # redirect somewhere
+
+
     def testChangeListSortingCallable(self):
         """
         Ensure we can sort on a list_display field that is a callable

tests/regressiontests/admin_views/models.py

@@ -287 +287 @@
 
 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)