Ticket #10448: patch10448against10203withtest.diff

django/contrib/admin/options.py

@@ -782 +782 @@
             'app_label': opts.app_label,
         }
         context.update(extra_context or {})
-        return self.render_change_form(request, context, add=True)
+        return self.render_change_form(request, context, form_url=form_url, add=True)
     add_view = transaction.commit_on_success(add_view)
 
     def change_view(self, request, object_id, extra_context=None):
@@ -805 +805 @@
             raise Http404(_('%(name)s object with primary key %(key)r does not exist.') % {'name': force_unicode(opts.verbose_name), 'key': escape(object_id)})
 
         if request.method == 'POST' and request.POST.has_key("_saveasnew"):
-            return self.add_view(request, form_url='../../add/')
+            return self.add_view(request, form_url='../add/')
 
         ModelForm = self.get_form(request, obj)
         formsets = []

tests/regressiontests/admin_views/tests.py

@@ -182 +182 @@
         response = self.client.get('/test_admin/%s/admin_views/thing/' % self.urlbit, {'color__id__exact': 'StringNotInteger!'})
         self.assertRedirects(response, '/test_admin/%s/admin_views/thing/?e=1' % self.urlbit)
 
+class SaveAsTest(TestCase):
+    fixtures = ['admin-views-users.xml','admin-views-person.xml']
+    urlbit = 'admin'
+    
+    def setUp(self):
+        self.client.login(username='super', password='secret')
+
+    def tearDown(self):
+        self.client.logout()
+    
+    def testSaveAsDuplication(self):
+        """Ensure save as actually creates a new person"""
+        post_data = {'_saveasnew':'', 'name':'John M', 'gender':1}
+        response = self.client.post('/test_admin/%s/admin_views/person/1/' % self.urlbit, post_data)
+        self.assertEqual(len(Person.objects.filter(name='John M')), 1)
+        self.assertEqual(len(Person.objects.filter(id=1)),1)
+    
+    def testSaveAsDisplay(self):
+        """Ensure that 'save as' is displayed when activated and after submitting invalid data aside 
+        save_as_new will not show us a form to overwrite the initial model"""
+        response = self.client.get('/test_admin/%s/admin_views/person/1/' % self.urlbit)
+        self.assert_('_saveasnew' in response.content)
+        post_data = {'_saveasnew':'', 'name':'John M', 'gender':3, 'alive':'checked'}
+        response = self.client.post('/test_admin/%s/admin_views/person/1/' % self.urlbit, post_data)
+        self.assert_('_saveasnew' not in response.content)
+        self.assert_('../add/' in response.content)
+        self.assert_('Add person' in response.content)
+
 class CustomModelAdminTest(AdminViewBasicTest):
     urlbit = "admin2"
 

tests/regressiontests/admin_views/models.py

@@ -156 +156 @@
     list_filter = ('gender',)
     search_fields = ('name',)
     ordering = ["id"]
+    save_as = True
 
 class Persona(models.Model):
     """