Ticket #7510: use_queryset_in_delete_view_and_change_view_for_ModelAdmin.diff

django/contrib/admin/options.py

@@ -550 +550 @@
         app_label = opts.app_label
 
         try:
-            obj = model._default_manager.get(pk=object_id)
+            obj = self.queryset(request).get(pk=object_id)
         except model.DoesNotExist:
             # Don't raise Http404 just yet, because we haven't checked
             # permissions yet. We don't want an unauthenticated user to be able
@@ -662 +662 @@
         app_label = opts.app_label
 
         try:
-            obj = self.model._default_manager.get(pk=object_id)
+            obj = self.queryset(request).get(pk=object_id)
         except self.model.DoesNotExist:
             # Don't raise Http404 just yet, because we haven't checked
             # permissions yet. We don't want an unauthenticated user to be able
@@ -719 +719 @@
             content_type__id__exact = ContentType.objects.get_for_model(model).id
         ).select_related().order_by('action_time')
         # If no history was found, see whether this object even exists.
-        obj = get_object_or_404(model, pk=object_id)
+        try:
+            obj = self.queryset(request).get(pk=object_id)
+        except model.DoesNotExist:
+            raise Http404('No %s matches the given query.' % model._meta.object_name)
         context = {
             'title': _('Change history: %s') % force_unicode(obj),
             'action_list': action_list,