diff options
| -rw-r--r-- | django/contrib/admin/options.py | 8 | ||||
| -rw-r--r-- | tests/admin_views/tests.py | 5 |
2 files changed, 11 insertions, 2 deletions
diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py index f0fd4c1a90..06d8e417a8 100644 --- a/django/contrib/admin/options.py +++ b/django/contrib/admin/options.py @@ -36,7 +36,6 @@ from django.forms.models import ( from django.forms.widgets import CheckboxSelectMultiple, SelectMultiple from django.http import Http404, HttpResponseRedirect from django.http.response import HttpResponseBase -from django.shortcuts import get_object_or_404 from django.template.response import SimpleTemplateResponse, TemplateResponse from django.utils import six from django.utils.decorators import method_decorator @@ -1646,7 +1645,12 @@ class ModelAdmin(BaseModelAdmin): from django.contrib.admin.models import LogEntry # First check if the user can see this history. model = self.model - obj = get_object_or_404(self.get_queryset(request), pk=unquote(object_id)) + obj = self.get_object(request, unquote(object_id)) + if obj is None: + raise Http404(_('%(name)s object with primary key %(key)r does not exist.') % { + 'name': force_text(model._meta.verbose_name), + 'key': escape(object_id), + }) if not self.has_change_permission(request, obj): raise PermissionDenied diff --git a/tests/admin_views/tests.py b/tests/admin_views/tests.py index 9b6c3db8de..a2c742f3ed 100644 --- a/tests/admin_views/tests.py +++ b/tests/admin_views/tests.py @@ -1551,6 +1551,11 @@ class AdminViewPermissionsTest(TestCase): self.client.get(reverse('admin:logout')) + def test_history_view_bad_url(self): + self.client.post(reverse('admin:login'), self.changeuser_login) + response = self.client.get(reverse('admin:admin_views_article_history', args=('foo',))) + self.assertEqual(response.status_code, 404) + def test_conditionally_show_add_section_link(self): """ The foreign key widget should only show the "add related" button if the |