Ticket #2386: date_based.py.2.diff

django/views/generic/date_based.py

@@ -133 +133 @@
     object_list = queryset.filter(**lookup_kwargs)
     if not object_list and not allow_empty:
         raise Http404
+
+    # Get the closest previous post's date, if it exists.
+    lookup_kwargs = {'%s__lte' % date_field: date.replace(day=1) - datetime.timedelta(days=1)}
+    previous_list = queryset.filter(**lookup_kwargs).order_by('-%s' % date_field)
+    if previous_list:
+        previous_month = getattr(previous_list[0], date_field).date()
+    else:
+        previous_month = None
+
+    # Get the closest next post's date, if it exists.
+    if date.month == 12:
+        lookup_kwargs = {'%s__gte' % date_field: date.replace(day=1, month=1, year=date.year + 1)}
+    else:
+        lookup_kwargs = {'%s__gte' % date_field: date.replace(day=1, month=date.month + 1)}
+    next_list = queryset.filter(**lookup_kwargs).order_by(date_field)
+    if next_list:
+        next_month = getattr(next_list[0], date_field).date()
+    else:
+        next_month = None
+
     if not template_name:
         template_name = "%s/%s_archive_month.html" % (model._meta.app_label, model._meta.object_name.lower())
     t = template_loader.get_template(template_name)
     c = RequestContext(request, {
         '%s_list' % template_object_name: object_list,
         'month': date,
-        'next_month': (last_day < datetime.date.today()) and (last_day + datetime.timedelta(days=1)) or None,
-        'previous_month': first_day - datetime.timedelta(days=1),
+        'next_month': next_month,
+        'previous_month': previous_month,
     }, context_processors)
     for key, value in extra_context.items():
         if callable(value):
@@ -235 +255 @@
     object_list = queryset.filter(**lookup_kwargs)
     if not allow_empty and not object_list:
         raise Http404
+
+    # Get the closest previous post's date, if it exists.
+    lookup_kwargs = {'%s__lte' % date_field: date - datetime.timedelta(days=1)}
+    previous_list = queryset.filter(**lookup_kwargs).order_by('-%s' % date_field)
+    if previous_list:
+        previous_day = getattr(previous_list[0], date_field).date()
+    else:
+        previous_day = None
+
+    # Get the closest next post's date, if it exists.
+    lookup_kwargs = {'%s__gte' % date_field: date + datetime.timedelta(days=1)}
+    next_list = queryset.filter(**lookup_kwargs).order_by(date_field)
+    if next_list:
+        next_day = getattr(next_list[0], date_field).date()
+    else:
+        next_day = None
+
     if not template_name:
         template_name = "%s/%s_archive_day.html" % (model._meta.app_label, model._meta.object_name.lower())
     t = template_loader.get_template(template_name)
     c = RequestContext(request, {
         '%s_list' % template_object_name: object_list,
         'day': date,
-        'previous_day': date - datetime.timedelta(days=1),
-        'next_day': (date < datetime.date.today()) and (date + datetime.timedelta(days=1)) or None,
+        'previous_day': previous_day,
+        'next_day': next_day,
     }, context_processors)
     for key, value in extra_context.items():
         if callable(value):