Ticket #7145: 7145_django_1.2.patch

django/contrib/admin/templatetags/admin_list.py

@@ -246 +246 @@
                 'choices': [{
                     'link': link({year_field: year_lookup, month_field: month_lookup, day_field: day.day}),
                     'title': capfirst(formats.date_format(day, 'MONTH_DAY_FORMAT'))
-                } for day in days]
+                } for day in days if day]
             }
         elif year_lookup:
             months = cl.query_set.filter(**{year_field: year_lookup}).dates(field_name, 'month')
@@ -263 +263 @@
             }
         else:
             years = cl.query_set.dates(field_name, 'year')
+            # Ignore ``None`` dates.
             return {
                 'show': True,
                 'choices': [{
                     'link': link({year_field: str(year.year)}),
                     'title': str(year.year),
-                } for year in years]
+                } for year in years if year]
             }
 date_hierarchy = register.inclusion_tag('admin/date_hierarchy.html')(date_hierarchy)
 

new file tests/regressiontests/admin_util/fixtures/admin_util_anotherarticles.json

@@ +1 @@
+[
+  {
+    "pk": 1,
+    "model": "admin_util.anotherarticle",
+    "fields": {
+      "title": "Test 1",
+      "created": null
+    }
+  },
+  {
+    "pk": 2,
+    "model": "admin_util.anotherarticle",
+    "fields": {
+      "title": "Test 2",
+      "created": "2010-01-21 10:58:32"
+    }
+  },
+  {
+    "pk": 3,
+    "model": "admin_util.anotherarticle",
+    "fields": {
+      "title": "Test 3",
+      "created": "2010-10-12 10:58:32"
+    }
+  },
+  {
+    "pk": 4,
+    "model": "admin_util.anotherarticle",
+    "fields": {
+      "title": "Test 3",
+      "created": "2010-10-13 10:58:32"
+    }
+  },
+  {
+    "pk": 5,
+    "model": "admin_util.anotherarticle",
+    "fields": {
+      "title": "Test 4",
+      "created": "2011-01-21 10:58:32"
+    }
+  }
+]

tests/regressiontests/admin_util/models.py

@@ -20 +20 @@
 
 class Count(models.Model):
     num = models.PositiveSmallIntegerField()
+
+
+class AnotherArticle(models.Model):
+    title = models.CharField(max_length=100)
+    created = models.DateTimeField(blank=True, null=True)
+
+    def __unicode__(self):
+        return self.title

tests/regressiontests/admin_util/tests.py

@@ -8 +8 @@
 
 from django.contrib import admin
 from django.contrib.admin.util import display_for_field, label_for_field, lookup_field
-from django.contrib.admin.views.main import EMPTY_CHANGELIST_VALUE
+from django.contrib.admin.views.main import EMPTY_CHANGELIST_VALUE, ChangeList
 from django.contrib.sites.models import Site
 from django.contrib.admin.util import NestedObjects
+from django.contrib.admin.templatetags.admin_list import date_hierarchy
 
-from models import Article, Count
+from models import Article, Count, AnotherArticle
 
 
 class NestedObjectsTests(TestCase):
@@ -220 +221 @@
             ),
             ("not Really the Model", MockModelAdmin.test_from_model)
         )
+
+
+class MockRequest(object):
+    pass
+
+
+class AnotherArticleAdmin(admin.ModelAdmin):
+    list_display = ['title', 'created']
+    date_hierarchy = 'created'
+
+
+class DateHierarchyTestCase(TestCase):
+    fixtures = ['admin_util_anotherarticles.json']
+    
+    def test_nullable_date_hierarchy(self):
+        """
+        Tests to ensure that the ``date_hierarchy`` tag doesn't blow up on
+        nullable dates.
+        """
+        mock_admin = AnotherArticleAdmin(AnotherArticle, None)
+        mock_request = MockRequest()
+        
+        mock_request.GET = {}
+        
+        cl = ChangeList(mock_request, AnotherArticle, mock_admin.list_display, mock_admin.list_filter, [], mock_admin.date_hierarchy, [], None, 50, False, mock_admin)
+        self.assertEqual(date_hierarchy(cl), {'choices': [{'link': '?created__year=2010', 'title': '2010'}, {'link': '?created__year=2011', 'title': '2011'}], 'show': True})
+        
+        mock_request.GET = {'created__year': '2010'}
+        cl = ChangeList(mock_request, AnotherArticle, mock_admin.list_display, mock_admin.list_filter, [], mock_admin.date_hierarchy, [], None, 50, False, mock_admin)
+        self.assertEqual(date_hierarchy(cl), {'choices': [{'link': '?created__year=2010&created__month=1', 'title': u'January 2010'}, {'link': '?created__year=2010&created__month=10', 'title': u'October 2010'}], 'back': {'link': '?', 'title': u'All dates'}, 'show': True})
+        
+        mock_request.GET = {'created__year': '2010', 'created__month': '10'}
+        cl = ChangeList(mock_request, AnotherArticle, mock_admin.list_display, mock_admin.list_filter, [], mock_admin.date_hierarchy, [], None, 50, False, mock_admin)
+        self.assertEqual(date_hierarchy(cl), {'choices': [{'link': '?created__day=12&created__year=2010&created__month=10', 'title': u'October 12'}, {'link': '?created__day=13&created__year=2010&created__month=10', 'title': u'October 13'}], 'back': {'link': '?created__year=2010', 'title': '2010'}, 'show': True})
+        
+        mock_request.GET = {'created__year': '2010', 'created__month': '10', 'created__day': '13'}
+        cl = ChangeList(mock_request, AnotherArticle, mock_admin.list_display, mock_admin.list_filter, [], mock_admin.date_hierarchy, [], None, 50, False, mock_admin)
+        self.assertEqual(date_hierarchy(cl), {'choices': [{'title': u'October 13'}], 'back': {'link': '?created__year=2010&created__month=10', 'title': u'October 2010'}, 'show': True})