diff --git a/django/contrib/admin/models.py b/django/contrib/admin/models.py index b697d7bdc82..f3be6530bf4 100644 --- a/django/contrib/admin/models.py +++ b/django/contrib/admin/models.py @@ -4,6 +4,7 @@ from django.db import models from django.conf import settings from django.contrib.contenttypes.models import ContentType from django.contrib.admin.util import quote +from django.core.urlresolvers import reverse from django.utils.translation import ugettext, ugettext_lazy as _ from django.utils.encoding import smart_text from django.utils.encoding import python_2_unicode_compatible @@ -72,5 +73,6 @@ class LogEntry(models.Model): This is relative to the Django admin index page. """ if self.content_type and self.object_id: - return "%s/%s/%s/" % (self.content_type.app_label, self.content_type.model, quote(self.object_id)) + url_name = 'admin:%s_%s_change' % (self.content_type.app_label, self.content_type.model) + return reverse(url_name, args=(quote(self.object_id),)) return None diff --git a/tests/admin_views/tests.py b/tests/admin_views/tests.py index 203d7d624b0..a38ce93219c 100644 --- a/tests/admin_views/tests.py +++ b/tests/admin_views/tests.py @@ -25,6 +25,7 @@ from django.contrib.admin.tests import AdminSeleniumWebDriverTestCase from django.contrib.auth import REDIRECT_FIELD_NAME from django.contrib.auth.models import Group, User, Permission, UNUSABLE_PASSWORD from django.contrib.contenttypes.models import ContentType +from django.core.urlresolvers import reverse from django.forms.util import ErrorList from django.template.response import TemplateResponse from django.test import TestCase @@ -1484,13 +1485,15 @@ class AdminViewStringPrimaryKeyTest(TestCase): def test_recentactions_link(self): "The link from the recent actions list referring to the changeform of the object should be quoted" response = self.client.get('/test_admin/admin/') - should_contain = """%s""" % (escape(quote(self.pk)), escape(self.pk)) + link = reverse('admin:admin_views_modelwithstringprimarykey_change', args=(quote(self.pk),)) + should_contain = """%s""" % (link, escape(self.pk)) self.assertContains(response, should_contain) def test_recentactions_without_content_type(self): "If a LogEntry is missing content_type it will not display it in span tag under the hyperlink." response = self.client.get('/test_admin/admin/') - should_contain = """%s""" % (escape(quote(self.pk)), escape(self.pk)) + link = reverse('admin:admin_views_modelwithstringprimarykey_change', args=(quote(self.pk),)) + should_contain = """%s""" % (link, escape(self.pk)) self.assertContains(response, should_contain) should_contain = "Model with string primary key" # capitalized in Recent Actions self.assertContains(response, should_contain)