Ticket #5273: 5273.patch

D:/web/projects/django-newforms/django/contrib/admin/filterspecs.py

@@ -59 +59 @@
         self.lookup_kwarg = '%s__%s__exact' % (f.name, f.rel.to._meta.pk.name)
         self.lookup_val = request.GET.get(self.lookup_kwarg, None)
         self.lookup_choices = f.rel.to._default_manager.all()
+        #lookup_none_kwarg defined only on nullable fields, empty string otherwise
+        self.lookup_none_kwarg  = (f.null or '') and '%s__%s__isnull' % (f.name, f.rel.to._meta.pk.name)
+        self.lookup_none_val = request.GET.get(self.lookup_none_kwarg, None)
 
     def has_output(self):
         return len(self.lookup_choices) > 1
@@ -67 +70 @@
         return self.lookup_title
 
     def choices(self, cl):
-        yield {'selected': self.lookup_val is None,
-               'query_string': cl.get_query_string({}, [self.lookup_kwarg]),
+        yield {'selected': self.lookup_val is None and self.lookup_none_val is None,
+               'query_string': cl.get_query_string({}, [self.lookup_kwarg,
+                                                        self.lookup_none_kwarg]),
                'display': _('All')}
         for val in self.lookup_choices:
             pk_val = getattr(val, self.field.rel.to._meta.pk.attname)
@@ -73 +77 @@
         for val in self.lookup_choices:
             pk_val = getattr(val, self.field.rel.to._meta.pk.attname)
             yield {'selected': self.lookup_val == smart_unicode(pk_val),
-                   'query_string': cl.get_query_string({self.lookup_kwarg: pk_val}),
+                   'query_string': cl.get_query_string({self.lookup_kwarg: pk_val},
+                                                       [self.lookup_none_kwarg]),
                    'display': val}
+        if self.lookup_none_kwarg:
+            yield {'selected': self.lookup_none_val != None,
+                   'query_string': cl.get_query_string({self.lookup_none_kwarg: True}, 
+                                                       [self.lookup_kwarg]),
+                   'display': _('None')}
 
 FilterSpec.register(lambda f: bool(f.rel), RelatedFilterSpec)