Ticket #18550: unquote_history_view.patch

django/contrib/admin/options.py

@@ -1321 +1321 @@
         opts = model._meta
         app_label = opts.app_label
         action_list = LogEntry.objects.filter(
-            object_id = object_id,
+            object_id = unquote(object_id),
             content_type__id__exact = ContentType.objects.get_for_model(model).id
         ).select_related().order_by('action_time')
         # If no history was found, see whether this object even exists.

tests/regressiontests/admin_views/tests.py

@@ -1344 +1344 @@
     def setUp(self):
         self.client.login(username='super', password='secret')
         content_type_pk = ContentType.objects.get_for_model(ModelWithStringPrimaryKey).pk
-        LogEntry.objects.log_action(100, content_type_pk, self.pk, self.pk, 2, change_message='')
+        LogEntry.objects.log_action(100, content_type_pk, self.pk, self.pk, 2, change_message='Change message')
 
     def tearDown(self):
         self.client.logout()
@@ -1353 +1353 @@
         "Retrieving the history for the object using urlencoded form of primary key should work"
         response = self.client.get('/test_admin/admin/admin_views/modelwithstringprimarykey/%s/history/' % quote(self.pk))
         self.assertContains(response, escape(self.pk))
+        self.assertNotContains(response, 'This object doesn’t have a change history.')
+        self.assertContains(response, 'Change message')
         self.assertEqual(response.status_code, 200)
 
     def test_get_change_view(self):