Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #20121 -- Removed LogEntry.get_admin_url's hard-coded path.

Updated LogEntry.get_admin_url to use 'reverse' instead
of a hard-coded path.
  • Loading branch information...
commit a4b8a4b632dbb6d9fed1a8654aed99a9c53560d4 1 parent ccf8d81
@floppya floppya authored charettes committed
Showing with 8 additions and 3 deletions.
  1. +3 −1 django/contrib/admin/models.py
  2. +5 −2 tests/admin_views/tests.py
View
4 django/contrib/admin/models.py
@@ -4,6 +4,7 @@
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 @@ def get_admin_url(self):
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
View
7 tests/admin_views/tests.py
@@ -25,6 +25,7 @@
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 @@ def test_changelist_to_changeform_link(self):
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 = """<a href="admin_views/modelwithstringprimarykey/%s/">%s</a>""" % (escape(quote(self.pk)), escape(self.pk))
+ link = reverse('admin:admin_views_modelwithstringprimarykey_change', args=(quote(self.pk),))
+ should_contain = """<a href="%s">%s</a>""" % (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 = """<a href="admin_views/modelwithstringprimarykey/%s/">%s</a>""" % (escape(quote(self.pk)), escape(self.pk))
+ link = reverse('admin:admin_views_modelwithstringprimarykey_change', args=(quote(self.pk),))
+ should_contain = """<a href="%s">%s</a>""" % (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)
Please sign in to comment.
Something went wrong with that request. Please try again.