Ticket #9739: patch9739.diff

AUTHORS

@@ -586 +586 @@
     Richard Davies <richard.davies@elastichosts.com>
     Richard House <Richard.House@i-logue.com>
     Rick Wagner <rwagner@physics.ucsd.edu>
+    Ridley Larsen <ridley@velocitywebworks.com>
     Robert Coup
     Robert Myers <myer0052@gmail.com>
     Roberto Aguilar <roberto@baremetal.io>

django/forms/widgets.py

@@ -891 +891 @@
 
     def decompress(self, value):
         if value:
-            value = to_current_timezone(value)
+            if isinstance(value, six.string_types):
+                return value.split(',')
+            else:
+                value = to_current_timezone(value)
             return [value.date(), value.time().replace(microsecond=0)]
         return [None, None]
 

docs/ref/contrib/admin/index.txt

@@ -1736 +1736 @@
     A hook for the initial data on admin change forms. By default, fields are
     given initial values from ``GET`` parameters. For instance,
     ``?name=initial_value`` will set the ``name`` field's initial value to be
-    ``initial_value``.
+    ``initial_value``. ManyToManyFields can be populated with a comma-separated
+    list of PKs, and DateTimeFields can be populated with comma-separated
+    date, time.
 
     This method should return a dictionary in the form
     ``{'fieldname': 'fieldval'}``::

tests/admin_views/tests.py

@@ -4331 +4331 @@
         response = self.client.get(reverse('admin:admin_views_prepopulatedpostlargeslug_add'))
         self.assertContains(response, "maxLength: 1000")  # instead of 1,000
 
+    def test_changeform_intial_data(self):
+        """
+        Regression test for #9739
+        Tests the prepopulation of fields within the admin site.
+        """
+        # Add sections for testing <select>.
+        s1 = Section.objects.create(name='Section 1')
+        # Prepopulate the Article add page with GET data.
+        querystring = '?title=TestTitle&content=Lorem%20Ipsum&date=2011-06-01,18:21:53&section=1'
+        response = self.client.get(
+            reverse('admin:admin_views_article_add') + querystring
+        )
+        self.assertEqual(response.status_code, 200)
+        # test if the prepopulated values are within the response and in the correct fields
+        self.assertContains(response, text='value="TestTitle"')
+        self.assertContains(response, text='Lorem Ipsum')
+        self.assertContains(response, text='value="2011-06-01"')
+        self.assertContains(response, text='value="18:21:53"')
+        self.assertContains(response, text='<option value="%s" selected="selected">' % (s1.pk))
+
 
 @override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
     ROOT_URLCONF="admin_views.urls")