Ticket #17200: 17200-patch-and-test.diff

django/contrib/admin/options.py

@@ -1088 +1088 @@
         context = {
             'title': _('Change %s') % force_unicode(opts.verbose_name),
             'adminform': adminForm,
-            'object_id': object_id,
+            'object_id': unquote(object_id),
             'original': obj,
             'is_popup': "_popup" in request.REQUEST,
             'media': mark_safe(media),

tests/regressiontests/admin_views/tests.py

@@ -14 +14 @@
 from django.contrib.admin.helpers import ACTION_CHECKBOX_NAME
 from django.contrib.admin.models import LogEntry, DELETION
 from django.contrib.admin.sites import LOGIN_FORM_KEY
-from django.contrib.admin.util import quote
+from django.contrib.admin.util import quote, unquote
 from django.contrib.admin.views.main import IS_POPUP_VAR
 from django.contrib.auth import REDIRECT_FIELD_NAME, admin
 from django.contrib.auth.models import Group, User, Permission, UNUSABLE_PASSWORD
@@ -1206 +1206 @@
         response = self.client.get('/test_admin/admin/admin_views/modelwithstringprimarykey/%s/' % quote(self.pk))
         self.assertContains(response, escape(self.pk))
         self.assertEqual(response.status_code, 200)
+        content_type_pk = ContentType.objects.get_for_model(ModelWithStringPrimaryKey).pk
+        should_contain = """<a href="../../../r/%s/%s/" class="viewsitelink">View on site</a>""" % (content_type_pk, escape(self.pk))
+        self.assertContains(response, should_contain)
 
     def test_changelist_to_changeform_link(self):
         "The link from the changelist referring to the changeform of the object should be quoted"

tests/regressiontests/admin_views/models.py

@@ -99 +99 @@
     def __unicode__(self):
         return self.id
 
+    def get_absolute_url(self):
+        # Need this to cause "view on site" link to appear on admin change form.
+        # We're not testing the specific URL produced by this method.
+        return '/%s/' % self.id
 
+
 class Color(models.Model):
     value = models.CharField(max_length=10)
     warm = models.BooleanField()