p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Changed generic admin changelist to order by ID if no other ordering is specified, rather than raising a scary exception 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@128 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2005-07-16 23:58:49 +00:00
parent cfcf3ca1e3
commit 82f0468801
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
django/views/admin/main.py
View File

@ -99,12 +99,15 @@ def change_list(request, app_label, module_name):
if params.has_key(PAGE_VAR): if params.has_key(PAGE_VAR):
del params[PAGE_VAR] del params[PAGE_VAR]
# For ordering, first check the "ordering" parameter in the admin options, # For ordering, first check the "ordering" parameter in the admin options,
# then check the object's default ordering. Finally, look for manually- # then check the object's default ordering. If neither of those exist,
# specified ordering from the query string. # order descending by ID by default. Finally, look for manually-specified
# ordering from the query string.
if lookup_opts.admin.ordering is not None: if lookup_opts.admin.ordering is not None:
order_field, order_type = lookup_opts.admin.ordering order_field, order_type = lookup_opts.admin.ordering
else: elif lookup_opts.ordering:
order_field, order_type = lookup_opts.ordering[0] order_field, order_type = lookup_opts.ordering[0]
else:
order_field, order_type = lookup_opts.pk.name, 'DESC'
if params.has_key(ORDER_VAR): if params.has_key(ORDER_VAR):
try: try:
order_key = int(params[ORDER_VAR]) order_key = int(params[ORDER_VAR])