Ticket #18139: 18139.diff

django/views/generic/dates.py

@@ -186 +186 @@
         Get a queryset properly filtered according to `allow_future` and any
         extra lookup kwargs.
         """
-        qs = self.get_queryset().filter(**lookup)
         date_field = self.get_date_field()
         allow_future = self.get_allow_future()
         allow_empty = self.get_allow_empty()
+        qs = self.get_queryset().filter(**lookup).order_by('-' + date_field)
         paginate_by = self.get_paginate_by(qs)
 
         if not allow_future:
@@ -236 +236 @@
         """
         qs = self.get_dated_queryset()
         date_list = self.get_date_list(qs, 'year')
-
-        if date_list:
-            object_list = qs.order_by('-' + self.get_date_field())
-        else:
-            object_list = qs.none()
-
+        object_list = qs if date_list else qs.none()
         return (date_list, object_list, {})
 
 
@@ -266 +261 @@
         # an error if it doesn't.
         year = self.get_year()
         date_field = self.get_date_field()
-        qs = self.get_dated_queryset(**{date_field+'__year': year})
+        qs = self.get_dated_queryset(**{date_field + '__year': year})
         date_list = self.get_date_list(qs, 'month')
 
-        if self.get_make_object_list():
-            object_list = qs.order_by('-'+date_field)
-        else:
-            # We need this to be a queryset since parent classes introspect it
-            # to find information about the model.
-            object_list = qs.none()
+        # We need this to be a queryset since parent classes introspect it
+        # to find information about the model.
+        object_list = qs if self.get_make_object_list() else qs.none()
 
         return (date_list, object_list, {'year': year})