mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-05 02:09:13 +00:00
Code Issues 32 Releases Wiki Activity

magic-removal: Fixed #1342 -- Added list_per_page option to Admin options. Thanks, Christopher Lenz

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2629 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2006-04-07 15:38:38 +00:00
parent c069623008
commit a45930b05c
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/contrib/admin/templatetags/admin_list.py
View File

@ -1,6 +1,6 @@
from django import template from django import template
from django.conf import settings from django.conf import settings
from django.contrib.admin.views.main import MAX_SHOW_ALL_ALLOWED, DEFAULT_RESULTS_PER_PAGE, ALL_VAR from django.contrib.admin.views.main import MAX_SHOW_ALL_ALLOWED, ALL_VAR
from django.contrib.admin.views.main import ORDER_VAR, ORDER_TYPE_VAR, PAGE_VAR, SEARCH_VAR from django.contrib.admin.views.main import ORDER_VAR, ORDER_TYPE_VAR, PAGE_VAR, SEARCH_VAR
from django.contrib.admin.views.main import IS_POPUP_VAR, EMPTY_CHANGELIST_VALUE, MONTHS from django.contrib.admin.views.main import IS_POPUP_VAR, EMPTY_CHANGELIST_VALUE, MONTHS
from django.core.exceptions import ObjectDoesNotExist from django.core.exceptions import ObjectDoesNotExist

5
django/contrib/admin/views/main.py
View File

@ -27,7 +27,6 @@ except ImportError:
MAX_SHOW_ALL_ALLOWED = 200 MAX_SHOW_ALL_ALLOWED = 200
# Changelist settings # Changelist settings
DEFAULT_RESULTS_PER_PAGE = 100
ALL_VAR = 'all' ALL_VAR = 'all'
ORDER_VAR = 'o' ORDER_VAR = 'o'
ORDER_TYPE_VAR = 'ot' ORDER_TYPE_VAR = 'ot'
@ -589,7 +588,7 @@ class ChangeList(object):
return '?' + '&'.join(['%s=%s' % (k, v) for k, v in p.items()]).replace(' ', '%20') return '?' + '&'.join(['%s=%s' % (k, v) for k, v in p.items()]).replace(' ', '%20')
def get_results(self, request): def get_results(self, request):
paginator = ObjectPaginator(self.query_set, DEFAULT_RESULTS_PER_PAGE) paginator = ObjectPaginator(self.query_set, self.lookup_opts.admin.list_per_page)
# Get the number of objects, with admin filters applied. # Get the number of objects, with admin filters applied.
try: try:
@ -611,7 +610,7 @@ class ChangeList(object):
full_result_count = self.manager.count() full_result_count = self.manager.count()
can_show_all = result_count <= MAX_SHOW_ALL_ALLOWED can_show_all = result_count <= MAX_SHOW_ALL_ALLOWED
multi_page = result_count > DEFAULT_RESULTS_PER_PAGE multi_page = result_count > self.lookup_opts.admin.list_per_page
# Get the list of objects to display on this page. # Get the list of objects to display on this page.
if (self.show_all and can_show_all) or not multi_page: if (self.show_all and can_show_all) or not multi_page:

3
django/db/models/options.py
View File

@ -196,7 +196,7 @@ class Options:
class AdminOptions: class AdminOptions:
def __init__(self, fields=None, js=None, list_display=None, list_filter=None, def __init__(self, fields=None, js=None, list_display=None, list_filter=None,
date_hierarchy=None, save_as=False, ordering=None, search_fields=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_per_page=100):
self.fields = fields self.fields = fields
self.js = js or [] self.js = js or []
self.list_display = list_display or ['__str__'] self.list_display = list_display or ['__str__']
@ -206,6 +206,7 @@ class AdminOptions:
self.search_fields = search_fields or [] self.search_fields = search_fields or []
self.save_on_top = save_on_top self.save_on_top = save_on_top
self.list_select_related = list_select_related self.list_select_related = list_select_related
self.list_per_page = list_per_page
self.manager = manager or Manager() self.manager = manager or Manager()
def get_field_sets(self, opts): def get_field_sets(self, opts):