summaryrefslogtreecommitdiff
path: root/django/contrib/admin/views
diff options
context:
space:
mode:
authorKaren Tracey <kmtracey@gmail.com>2008-09-21 16:57:26 +0000
committerKaren Tracey <kmtracey@gmail.com>2008-09-21 16:57:26 +0000
commitfd366a85315dfc836e73f9cdee3e7309281dfd3e (patch)
tree275648ffb20a93e8b5448009c0c5578ed36f6fc2 /django/contrib/admin/views
parent0ededc611fd9c98812652f4853a0eebf96942da3 (diff)
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
Diffstat (limited to 'django/contrib/admin/views')
-rw-r--r--django/contrib/admin/views/main.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/django/contrib/admin/views/main.py b/django/contrib/admin/views/main.py
index a6a206d1dc..bcfa3a8155 100644
--- a/django/contrib/admin/views/main.py
+++ b/django/contrib/admin/views/main.py
@@ -162,8 +162,7 @@ class ChangeList(object):
except AttributeError:
pass
else:
- if not isinstance(f.rel, models.ManyToOneRel) or not f.null:
- order_field = f.name
+ order_field = f.name
except (IndexError, ValueError):
pass # Invalid ordering specified. Just use the default.
if ORDER_TYPE_VAR in params and params[ORDER_TYPE_VAR] in ('asc', 'desc'):