summaryrefslogtreecommitdiff
path: root/django/contrib/admin
diff options
context:
space:
mode:
authorJuan Catalano <catalanojuan@gmail.com>2013-09-06 20:28:48 +0000
committerJulien Phalip <jphalip@gmail.com>2013-09-07 14:53:29 -0500
commit04415bf81b2440a08fc224e6c481bcb5840bbcbc (patch)
tree0dc7b82aac7ee935ad3bf2d48389d6b85e5a5cb5 /django/contrib/admin
parente192739b3e3209a371a5d0f5f05fd083e88259f2 (diff)
Fixed #21013 -- Ensure that ModelAdmin.get_queryset is considered for the admin history view.
Diffstat (limited to 'django/contrib/admin')
-rw-r--r--django/contrib/admin/options.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py
index f53d655bfc..1b215879d1 100644
--- a/django/contrib/admin/options.py
+++ b/django/contrib/admin/options.py
@@ -1537,7 +1537,7 @@ 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(model, pk=unquote(object_id))
+ obj = get_object_or_404(self.get_queryset(request), pk=unquote(object_id))
if not self.has_change_permission(request, obj):
raise PermissionDenied