Ticket #1342: django_1342.diff

django/db/models/options.py

@@ -196 +196 @@
 class AdminOptions:
     def __init__(self, fields=None, js=None, list_display=None, list_filter=None,
         date_hierarchy=None, save_as=False, ordering=None, search_fields=None,
-        save_on_top=False, list_select_related=False, manager=None):
+        save_on_top=False, list_select_related=False, manager=None, list_limit=None):
         self.fields = fields
         self.js = js or []
         self.list_display = list_display or ['__str__']
         self.list_filter = list_filter or []
+        self.list_limit = list_limit
         self.date_hierarchy = date_hierarchy
         self.save_as, self.ordering = save_as, ordering
         self.search_fields = search_fields or []

django/contrib/admin/views/main.py

@@ -589 +589 @@
         return '?' + '&'.join(['%s=%s' % (k, v) for k, v in p.items()]).replace(' ', '%20')
 
     def get_results(self, request):
-        paginator = ObjectPaginator(self.query_set, DEFAULT_RESULTS_PER_PAGE)
+        results_per_page = self.lookup_opts.admin.list_limit
+        if results_per_page is None:
+            results_per_page = DEFAULT_RESULTS_PER_PAGE
+        paginator = ObjectPaginator(self.query_set, results_per_page)
 
         # Get the number of objects, with admin filters applied.
         try:
@@ -611 +614 @@
             full_result_count = self.manager.count()
 
         can_show_all = result_count <= MAX_SHOW_ALL_ALLOWED
-        multi_page = result_count > DEFAULT_RESULTS_PER_PAGE
+        multi_page = result_count > results_per_page
 
         # Get the list of objects to display on this page.
         if (self.show_all and can_show_all) or not multi_page: