Ticket #7145: 7145_django_1.3.patch

tests/regressiontests/admin_util/models.py

@@ -35 +35 @@
 
     class Meta:
         verbose_name = "awesome guest"
+
+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

@@ -2 +2 @@
 
 from django.conf import settings
 from django.contrib import admin
+from django.contrib.admin.templatetags.admin_list import date_hierarchy
 from django.contrib.admin.util import display_for_field, label_for_field, lookup_field
 from django.contrib.admin.util import NestedObjects
-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.db import models, DEFAULT_DB_ALIAS
 from django.test import TestCase
 from django.utils import unittest
 from django.utils.formats import localize
 
-from models import Article, Count, Event, Location
+from models import Article, Count, Event, Location, AnotherArticle
 
 
 class NestedObjectsTests(TestCase):
@@ -235 +236 @@
             label_for_field('guest', Event, return_attr=True),
             ('awesome guest', None),
         )
+
+
+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})