Ticket #7113: changelist_custom_qs.diff

django/contrib/admin/views/main.py

@@ -121 +121 @@
         self.opts = model._meta
         self.lookup_opts = self.opts
         self.root_query_set = model_admin.queryset(request)
+        self.root_query_set_class = type(self.root_query_set)
         self.list_display = list_display
         self.list_display_links = list_display_links
         self.list_filter = list_filter
@@ -300 +301 @@
         if self.search_fields and self.query:
             for bit in self.query.split():
                 or_queries = [models.Q(**{construct_search(field_name): bit}) for field_name in self.search_fields]
-                other_qs = QuerySet(self.model)
+                other_qs = self.root_query_set_class(self.model)
                 other_qs.dup_select_related(qs)
                 other_qs = other_qs.filter(reduce(operator.or_, or_queries))
                 qs = qs & other_qs