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

Fixed #7582: Removed checks that prevented null=True ForeignKey fields from being sortable in Admin. Post queryset-refactor there seems no reason to disallow this. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9080 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Karen Tracey 2008-09-21 16:57:26 +00:00
parent 0ededc611f
commit fd366a8531
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -115,10 +115,6 @@ def result_headers(cl):
# So this _is_ a sortable non-field. Go to the yield # So this _is_ a sortable non-field. Go to the yield
# after the else clause. # after the else clause.
else:
if isinstance(f.rel, models.ManyToOneRel) and f.null:
yield {"text": f.verbose_name}
continue
else: else:
header = f.verbose_name header = f.verbose_name

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

@ -162,7 +162,6 @@ class ChangeList(object):
except AttributeError: except AttributeError:
pass pass
else: else:
if not isinstance(f.rel, models.ManyToOneRel) or not f.null:
order_field = f.name order_field = f.name
except (IndexError, ValueError): except (IndexError, ValueError):
pass # Invalid ordering specified. Just use the default. pass # Invalid ordering specified. Just use the default.