Ticket #15717: 15717.diff

django/contrib/databrowse/plugins/calendars.py

@@ -6 +6 @@
 from django.utils.text import capfirst
 from django.utils.encoding import force_unicode
 from django.utils.safestring import mark_safe
-from django.views.generic import date_based
+from django.views.generic import dates
 from django.utils import datetime_safe
 
 class CalendarPlugin(DatabrowsePlugin):
@@ -65 +65 @@
 
     def calendar_view(self, request, field, year=None, month=None, day=None):
         easy_model = EasyModel(self.site, self.model)
-        queryset = easy_model.get_query_set()
-        extra_context = {'root_url': self.site.root_url, 'model': easy_model, 'field': field}
+        root_url = self.site.root_url
+
+        class DateViewMixin(object):
+            allow_empty = False
+            allow_future = True
+            date_field = field.name
+            queryset = easy_model.get_query_set()
+            def get_context_data(self, **kwargs):
+                context = super(DateViewMixin, self).get_context_data(**kwargs)
+                context.update({'root_url': root_url, 'model': easy_model, 'field': field})
+                return context
+
         if day is not None:
-            return date_based.archive_day(request, year, month, day, queryset, field.name,
-                template_name='databrowse/calendar_day.html', allow_empty=False, allow_future=True,
-                extra_context=extra_context)
+            class DayView(DateViewMixin, dates.DayArchiveView):
+                template_name = 'databrowse/calendar_day.html'
+            return DayView.as_view(year=year, month=month, day=day)(request)
         elif month is not None:
-            return date_based.archive_month(request, year, month, queryset, field.name,
-                template_name='databrowse/calendar_month.html', allow_empty=False, allow_future=True,
-                extra_context=extra_context)
+            class MonthView(DateViewMixin, dates.MonthArchiveView):
+                template_name = 'databrowse/calendar_month.html'
+            return MonthView.as_view(year=year, month=month)(request)
         elif year is not None:
-            return date_based.archive_year(request, year, queryset, field.name,
-                template_name='databrowse/calendar_year.html', allow_empty=False, allow_future=True,
-                extra_context=extra_context)
+            class YearView(DateViewMixin, dates.YearArchiveView):
+                template_name = 'databrowse/calendar_year.html'
+            return YearView.as_view(year=year)(request)
         else:
-            return date_based.archive_index(request, queryset, field.name,
-                template_name='databrowse/calendar_main.html', allow_empty=True, allow_future=True,
-                extra_context=extra_context)
+            class IndexView(DateViewMixin, dates.ArchiveIndexView):
+                template_name = 'databrowse/calendar_main.html'
+            return IndexView.as_view()(request)
+
         assert False, ('%s, %s, %s, %s' % (field, year, month, day))