diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py
index f01edbc..e192d9d 100644
a
|
b
|
class ModelAdmin(BaseModelAdmin):
|
166 | 166 | ordering = None |
167 | 167 | inlines = [] |
168 | 168 | |
| 169 | manager = None |
| 170 | |
169 | 171 | # Custom templates (designed to be over-ridden in subclasses) |
170 | 172 | change_form_template = None |
171 | 173 | change_list_template = None |
… |
… |
class ModelAdmin(BaseModelAdmin):
|
239 | 241 | Returns a QuerySet of all model instances that can be edited by the |
240 | 242 | admin site. This is used by changelist_view. |
241 | 243 | """ |
242 | | qs = self.model._default_manager.get_query_set() |
| 244 | if self.manager is None: |
| 245 | qs = self.model._default_manager.get_query_set() |
| 246 | else: |
| 247 | qs = self.manager.get_query_set() |
243 | 248 | # TODO: this should be handled by some parameter to the ChangeList. |
244 | 249 | ordering = self.ordering or () # otherwise we might try to *None, which is bad ;) |
245 | 250 | if ordering: |