Kaydet (Commit) 82f04688 authored tarafından Adrian Holovaty's avatar Adrian Holovaty

Changed generic admin changelist to order by ID if no other ordering is…

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
üst cfcf3ca1
...@@ -99,12 +99,15 @@ def change_list(request, app_label, module_name): ...@@ -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])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment