Ticket #10890: week_pagination2.diff

django/views/generic/date_based.py

@@ -183 +183 @@
     Context:
         week:
             (date) this week
+        next_week:
+            (dict) with three keys:
+                'date' (date): the first day of the next week
+                'year' (int): the year of first day of the next week
+                'week' (int): the week number of the first day of the next week
+            or None if the next week is in the future
+        previous_week:
+            (dict) with three keys:
+                'date' (date): the first day of the previous week
+                'year' (int): the year of first day of the previous week
+                'week' (int): the week number of the first day of the previous week
         object_list:
             list of objects published in the given week
     """
@@ -208 +219 @@
     if last_day >= now.date() and not allow_future:
         lookup_kwargs['%s__lte' % date_field] = now
     object_list = queryset.filter(**lookup_kwargs)
+
+    # Calculate the next week, if applicable.
+    if allow_future:
+        next_week = {
+            'year': last_day.year, 
+            'week': last_day.strftime('%U'),
+            'date': last_day
+        }
+    elif last_day < datetime.date.today():
+        next_week = {
+            'year': last_day.year, 
+            'week': last_day.strftime('%U'),
+            'date': last_day
+        }
+    else:
+        next_week = None
+
+    # Calculate the previous week
+    previous_week_dt = first_day - datetime.timedelta(days=7)
+    previous_week = {
+        'year': previous_week_dt.year, 
+        'week': previous_week_dt.strftime('%U'),
+        'date': previous_week_dt
+    }
+
     if not object_list and not allow_empty:
         raise Http404
     if not template_name:
@@ -216 +252 @@
     c = RequestContext(request, {
         '%s_list' % template_object_name: object_list,
         'week': date,
+        'previous_week': previous_week,
+        'next_week': next_week,
     })
     for key, value in extra_context.items():
         if callable(value):