Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #20934 -- Avoided NoReverseMatch in ModelAdmin.changelist_view

The view tried to display links to a ModelAdmin's change_view, which
resulted in NoReverseMatches if get_urls was overridden to remove the
corresponding url.
  • Loading branch information...
commit 65cf82bd08631a7aa8d9dd007b2527476fa3304f 1 parent 6af05e7
@koirikivi koirikivi authored timgraham committed
View
42 django/contrib/admin/templatetags/admin_list.py
@@ -9,6 +9,7 @@
ORDER_VAR, PAGE_VAR, SEARCH_VAR)
from django.contrib.admin.templatetags.admin_static import static
from django.core.exceptions import ObjectDoesNotExist
+from django.core.urlresolvers import NoReverseMatch
from django.db import models
from django.utils import formats
from django.utils.html import escapejs, format_html
@@ -216,25 +217,36 @@ def items_for_result(cl, result, form):
row_class = mark_safe(' class="%s"' % ' '.join(row_classes))
# If list_display_links not defined, add the link tag to the first field
if (first and not cl.list_display_links) or field_name in cl.list_display_links:
- table_tag = {True:'th', False:'td'}[first]
+ table_tag = 'th' if first else 'td'
first = False
- url = cl.url_for_result(result)
- url = add_preserved_filters({'preserved_filters': cl.preserved_filters, 'opts': cl.opts}, url)
- # Convert the pk to something that can be used in Javascript.
- # Problem cases are long ints (23L) and non-ASCII strings.
- if cl.to_field:
- attr = str(cl.to_field)
+
+ # Display link to the result's change_view if the url exists, else
+ # display just the result's representation.
+ try:
+ url = cl.url_for_result(result)
+ except NoReverseMatch:
+ link_or_text = result_repr
else:
- attr = pk
- value = result.serializable_value(attr)
- result_id = escapejs(value)
- yield format_html('<{0}{1}><a href="{2}"{3}>{4}</a></{5}>',
+ url = add_preserved_filters({'preserved_filters': cl.preserved_filters, 'opts': cl.opts}, url)
+ # Convert the pk to something that can be used in Javascript.
+ # Problem cases are long ints (23L) and non-ASCII strings.
+ if cl.to_field:
+ attr = str(cl.to_field)
+ else:
+ attr = pk
+ value = result.serializable_value(attr)
+ result_id = escapejs(value)
+ link_or_text = format_html(
+ '<a href="{0}"{1}>{2}</a>',
+ url,
+ format_html(' onclick="opener.dismissRelatedLookupPopup(window, &#39;{0}&#39;); return false;"', result_id)
+ if cl.is_popup else '',
+ result_repr)
+
+ yield format_html('<{0}{1}>{2}</{3}>',
table_tag,
row_class,
- url,
- format_html(' onclick="opener.dismissRelatedLookupPopup(window, &#39;{0}&#39;); return false;"', result_id)
- if cl.is_popup else '',
- result_repr,
+ link_or_text,
table_tag)
else:
# By default the fields come from ModelAdmin.list_editable, but if we pull
View
13 tests/admin_views/tests.py
@@ -630,6 +630,19 @@ def test_allows_attributeerror_to_bubble_up(self):
with self.assertRaises(AttributeError):
self.client.get('/test_admin/%s/admin_views/simple/' % self.urlbit)
+ def test_changelist_with_no_change_url(self):
+ """
+ ModelAdmin.changelist_view shouldn't result in a NoReverseMatch if url
+ for change_view is removed from get_urls
+
+ Regression test for #20934
+ """
+ UnchangeableObject.objects.create()
+ response = self.client.get('/test_admin/admin/admin_views/unchangeableobject/')
+ self.assertEqual(response.status_code, 200)
+ # Check the format of the shown object -- shouldn't contain a change link
+ self.assertContains(response, '<th class="field-__str__">UnchangeableObject object</th>', html=True)
+
@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
class AdminViewFormUrlTest(TestCase):

0 comments on commit 65cf82b

Please sign in to comment.
Something went wrong with that request. Please try again.