Fixed #7582: Removed checks that prevented null=True ForeignKey field…

…s 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
django · Sep 21, 2008 · fd366a8 · fd366a8
1 parent 0ededc6
commit fd366a8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/django/contrib/admin/templatetags/admin_list.py b/django/contrib/admin/templatetags/admin_list.py
@@ -116,11 +116,7 @@ def result_headers(cl):
             # So this _is_ a sortable non-field.  Go to the yield
             # after the else clause.
         else:
-            if isinstance(f.rel, models.ManyToOneRel) and f.null:
-                yield {"text": f.verbose_name}
-                continue
-            else:
-                header = f.verbose_name
+            header = f.verbose_name
 
         th_classes = []
         new_order_type = 'asc'

diff --git a/django/contrib/admin/views/main.py b/django/contrib/admin/views/main.py
@@ -162,8 +162,7 @@ def get_ordering(self):
                     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'):