Ticket #14467: AllValuesFilterSpec_Null.diff

django/contrib/admin/filterspecs.py

@@ -161 +161 @@
 class AllValuesFilterSpec(FilterSpec):
     def __init__(self, f, request, params, model, model_admin):
         super(AllValuesFilterSpec, self).__init__(f, request, params, model, model_admin)
-        self.lookup_val = request.GET.get(f.name, None)
+        self.lookup_kwarg = f.name
+        self.lookup_kwarg2 = '%s__isnull' % f.name
+        self.lookup_val = request.GET.get(self.lookup_kwarg, None)
+        self.lookup_val2 = request.GET.get(self.lookup_kwarg2, None)
         self.lookup_choices = model_admin.queryset(request).distinct().order_by(f.name).values(f.name)
 
     def title(self):
         return self.field.verbose_name
 
     def choices(self, cl):
-        yield {'selected': self.lookup_val is None,
-               'query_string': cl.get_query_string({}, [self.field.name]),
+        yield {'selected': self.lookup_val is None and self.lookup_val2 is None,
+               'query_string': cl.get_query_string({}, [self.lookup_kwarg, self.lookup_kwarg2]),
                'display': _('All')}
         for val in self.lookup_choices:
-            val = smart_unicode(val[self.field.name])
-            yield {'selected': self.lookup_val == val,
-                   'query_string': cl.get_query_string({self.field.name: val}),
-                   'display': val}
+            val = val[self.field.name]
+            if val is None:
+                val = smart_unicode(val)
+                yield {'selected': self.lookup_val2 is not None,
+                    'query_string': cl.get_query_string({self.lookup_kwarg2: 'True'}, [self.lookup_kwarg]),
+                    'display': val}
+            else:
+                val = smart_unicode(val)
+                yield {'selected': self.lookup_val2 == val,
+                       'query_string': cl.get_query_string({self.lookup_kwarg: val}, [self.lookup_kwarg2]),
+                       'display': val}
 FilterSpec.register(lambda f: True, AllValuesFilterSpec)