mirrors
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues 24 Releases Wiki Activity

Fixed #218 -- Fixed admin change-list column sorting 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@333 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2005-07-28 14:59:50 +00:00
parent 1d2ab36068
commit f5b605ab1b
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -103,9 +103,9 @@ def change_list(request, app_label, module_name):
ordering = meta.handle_legacy_orderlist(ordering) ordering = meta.handle_legacy_orderlist(ordering)
if ordering[0].startswith('-'): if ordering[0].startswith('-'):
order_field, order_type = ordering[0][1:], 'DESC' order_field, order_type = ordering[0][1:], 'desc'
else: else:
order_field, order_type = ordering[0], 'ASC' order_field, order_type = ordering[0], 'asc'
if params.has_key(ORDER_VAR): if params.has_key(ORDER_VAR):
try: try:
try: try:
@ -143,7 +143,8 @@ def change_list(request, app_label, module_name):
if isinstance(f.rel, meta.ManyToOne): if isinstance(f.rel, meta.ManyToOne):
lookup_params['select_related'] = True lookup_params['select_related'] = True
break break
lookup_params['order_by'] = ((order_type == 'DESC' and '-' or '') + lookup_order_field,) lookup_params['order_by'] = ((order_type == 'desc' and '-' or '') + lookup_order_field,)
assert False, lookup_params['order_by']
if lookup_opts.admin.search_fields and query: if lookup_opts.admin.search_fields and query:
or_queries = [] or_queries = []
for bit in query.split(): for bit in query.split():