p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Improved generic detail view error message for when pk or slug is missing.

This commit is contained in:
Vincent Poulailleau 2018-01-15 13:03:13 +01:00 committed by Tim Graham
parent 27557a7a99
commit fcd431c6c3
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
django/views/generic/detail.py
View File

@ -42,9 +42,10 @@ class SingleObjectMixin(ContextMixin):
# If none of those are defined, it's an error. # If none of those are defined, it's an error.
if pk is None and slug is None: if pk is None and slug is None:
raise AttributeError("Generic detail view %s must be called with " raise AttributeError(
"either an object pk or a slug." "Generic detail view %s must be called with either an object "
% self.__class__.__name__) "pk or a slug in the URLconf." % self.__class__.__name__
)
try: try:
# Get the single item from the filtered queryset # Get the single item from the filtered queryset

6
tests/generic_views/test_dates.py
View File

@ -695,7 +695,11 @@ class DateDetailViewTests(TestDataMixin, TestCase):
self.assertEqual(res.context['exception'], 'Date out of range') self.assertEqual(res.context['exception'], 'Date out of range')
def test_invalid_url(self): def test_invalid_url(self):
with self.assertRaises(AttributeError): msg = (
'Generic detail view BookDetail must be called with either an '
'object pk or a slug in the URLconf.'
)
with self.assertRaisesMessage(AttributeError, msg):
self.client.get("/dates/books/2008/oct/01/nopk/") self.client.get("/dates/books/2008/oct/01/nopk/")
def test_get_object_custom_queryset(self): def test_get_object_custom_queryset(self):