summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2012-09-22 11:45:51 +0200
committerAymeric Augustin <aymeric.augustin@m4x.org>2012-09-22 11:47:34 +0200
commitbaa33cd8faa16737524b1ac355802a10dd63571c (patch)
tree4d8049f01ef4eca8943f6618c0f0592762c8e228 /django
parent59afc18f3735abfd7ab4b1a904000a547daed4ca (diff)
Fixed #16218 -- date_list order in generic CBVs.
Thanks nnrcschmdt for the report and bpeschier for the initial version of the patch.
Diffstat (limited to 'django')
-rw-r--r--django/views/generic/dates.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/django/views/generic/dates.py b/django/views/generic/dates.py
index 52e13a4533..e1b0eb99fe 100644
--- a/django/views/generic/dates.py
+++ b/django/views/generic/dates.py
@@ -377,7 +377,7 @@ class BaseDateListView(MultipleObjectMixin, DateMixin, View):
"""
return self.date_list_period
- def get_date_list(self, queryset, date_type=None):
+ def get_date_list(self, queryset, date_type=None, ordering='ASC'):
"""
Get a date list by calling `queryset.dates()`, checking along the way
for empty lists that aren't allowed.
@@ -387,7 +387,7 @@ class BaseDateListView(MultipleObjectMixin, DateMixin, View):
if date_type is None:
date_type = self.get_date_list_period()
- date_list = queryset.dates(date_field, date_type)[::-1]
+ date_list = queryset.dates(date_field, date_type, ordering)
if date_list is not None and not date_list and not allow_empty:
name = force_text(queryset.model._meta.verbose_name_plural)
raise Http404(_("No %(verbose_name_plural)s available") %
@@ -409,7 +409,7 @@ class BaseArchiveIndexView(BaseDateListView):
Return (date_list, items, extra_context) for this request.
"""
qs = self.get_dated_queryset(ordering='-%s' % self.get_date_field())
- date_list = self.get_date_list(qs)
+ date_list = self.get_date_list(qs, ordering='DESC')
if not date_list:
qs = qs.none()