Ticket #9739: 9739-r16345.diff

docs/ref/contrib/admin/index.txt

@@ -1817 +1817 @@
 URL names for the purposes of :ref:`reversing them<admin-reverse-urls>`. This
 is only necessary if you are using more than one ``AdminSite``.
 
+Pre-populating fields in admin sites
+--------------------------------
+It's easy to offer prefilled values for the fields of an admin site.
+Simply append the value to the URL as GET parameters with the name of the 
+field as key, e.g.:
+
+    /admin/model/add/?forename=John&surname=Doe
+    
+Related fields can also be prefilled:
+
+    /admin/modelname/add/?surname=Doe&relatedfieldvalue=2
+
 Adding views to admin sites
 ---------------------------
 

django/contrib/admin/options.py

@@ -911 +911 @@
                     continue
                 if isinstance(f, models.ManyToManyField):
                     initial[k] = initial[k].split(",")
+                if isinstance(f, models.DateTimeField): 
+                    initial[k] = initial[k].split(",") 
             form = ModelForm(initial=initial)
             prefixes = {}
             for FormSet, inline in zip(self.get_formsets(request),

tests/regressiontests/admin_views/tests.py

@@ -535 +535 @@
             self.client.get("/test_admin/admin/admin_views/inquisition/?leader__name=Palin&leader__age=27")
         except SuspiciousOperation:
             self.fail("Filters should be allowed if they are defined on a ForeignKey pointing to this model")
+    
+    def test_field_prepopulation(self):
+        """
+        Regression test for #9739
+        Tests the prepopulation of fields within the admin site.
+        """
+        # prepare some sections
+        section_0 = Section.objects.create(name='Section 1')
+        section_1 = Section.objects.create(name='Section 2')
+        section_2 = Section.objects.create(name='Section 3')
+        # call the addition page for articles
+        response = self.client.get('/test_admin/' + self.urlbit + '/admin_views/article/add/?title=Testtitle&content=Lorem%20Ipsum&date=2011-06-01,18:21:53&section=2')
+        self.assertEqual(response.status_code, 200)
+        # test if the prepopulated values are within the response and in the correct fields
+        self.assertRegexpMatches(response.content, r'<input (?=.*name="title")(?=.*value="Testtitle").* />')
+        self.assertRegexpMatches(response.content, r'<textarea (?=.*name="content").*>Lorem Ipsum</textarea>')
+        self.assertRegexpMatches(response.content, r'<input (?=.*name="date_0")(?=.*value="2011-06-01").* />')
+        self.assertRegexpMatches(response.content, r'<input (?=.*name="date_1")(?=.*value="18:21:53").* />')
+        self.assertRegexpMatches(response.content, r'<option (?=.*value="2")(?=.*selected="selected").*>Section object</option>')
+        
 
 class AdminJavaScriptTest(AdminViewBasicTest):
     def testSingleWidgetFirsFieldFocus(self):