Fix sorting in archive view

We now use the (annotated) publication date instead of the creation date

diff --git a/notes/models.py b/notes/models.py
index 0056f0e706d29990ba4f5721cc0fc9dbdbf51375..5453f9b3406292816b48a7e921097784abe819f5 100644 (file)
--- a/notes/models.py
+++ b/notes/models.py
@@ -25,22 +25,22 @@ class NoteManager(models.Manager):
         return super().all().annotate(publication_date=Coalesce('published_at', 'created_at')).order_by('-publication_date')
 
     def per_year(self, year):
         return super().all().annotate(publication_date=Coalesce('published_at', 'created_at')).order_by('-publication_date')
 
     def per_year(self, year):

-        return self.all_published().filter(created_at__year=year)
+        return self.all_published().filter(publication_date__year=year)

 
     def per_month(self, year, month):
 
     def per_month(self, year, month):

-        return self.per_year(year).filter(created_at__month=month)
+        return self.per_year(year).filter(publication_date__month=month)

 
     def years(self):
 
     def years(self):

-        return self.all_published().annotate(created_year=ExtractYear('created_at')).values_list('created_year', flat=True).distinct().order_by('created_year')
+        return self.all_published().annotate(published_year=ExtractYear('publication_date')).values_list('published_year', flat=True).distinct().order_by('published_year')

 
     def years_with_total(self):
 
     def years_with_total(self):

-        return self.all_published().annotate(created_year=ExtractYear('created_at')).values('created_year').annotate(total=Count('id')).order_by('created_year').values('created_year', 'total').distinct()
+        return self.all_published().annotate(published_year=ExtractYear('publication_date')).values('published_year').annotate(total=Count('id')).order_by('published_year').values('published_year', 'total').distinct()

 
     def months(self, year):
 
     def months(self, year):

-        return self.per_year(year).annotate(created_month=ExtractMonth('created_at')).values_list('created_month', flat=True).distinct().order_by('created_month')
+        return self.per_year(year).annotate(published_month=ExtractMonth('publication_date')).values_list('published_month', flat=True).distinct().order_by('published_month')

 
     def months_with_total(self, year):
 
     def months_with_total(self, year):

-        return self.per_year(year).annotate(created_month=ExtractMonth('created_at')).values('created_month').annotate(total=Count('id')).order_by('created_month').values('created_month', 'total').distinct()
+        return self.per_year(year).annotate(published_month=ExtractMonth('publication_date')).values('published_month').annotate(total=Count('id')).order_by('published_month').values('published_month', 'total').distinct()

 
 class Note(models.Model):
     title = models.CharField(max_length=250)
 
 class Note(models.Model):
     title = models.CharField(max_length=250)

diff --git a/notes/templates/archive_main.html b/notes/templates/archive_main.html
index 2b1771176163b40c8f60b6670a7e3d2d20cdc848..1cf6a28ebc1eda57a4f1a094b6bf67e9789be45b 100644 (file)
--- a/notes/templates/archive_main.html
+++ b/notes/templates/archive_main.html
@@ -8,7 +8,7 @@
 {% if years %}
 <ul>
   {% for year in years %}
 {% if years %}
 <ul>
   {% for year in years %}

-    <li><a href="{{ year.created_year }}/">{{ year.created_year }}</a> ({{ year.total }})</li>
+    <li><a href="{{ year.published_year }}/">{{ year.published_year }}</a> ({{ year.total }})</li>

   {% endfor %}
 </ul>
 {% else %}
   {% endfor %}
 </ul>
 {% else %}

diff --git a/notes/templates/archive_year.html b/notes/templates/archive_year.html
index d72b31fd72b414ab8c3855a18bbd6bbee6c95bb7..0821ccb1423412cf16fb07d2300a07db29b4a8f3 100644 (file)
--- a/notes/templates/archive_year.html
+++ b/notes/templates/archive_year.html
@@ -9,7 +9,7 @@
 {% if months %}
 <ul>
   {% for month in months %}
 {% if months %}
 <ul>
   {% for month in months %}

-    <li><a href="{{ month.created_month }}/">{{ month.created_month|month_name }}</a> ({{ month.total }})</li>
+    <li><a href="{{ month.published_month }}/">{{ month.published_month|month_name }}</a> ({{ month.total }})</li>

   {% endfor %}
 </ul>
 {% else %}
   {% endfor %}
 </ul>
 {% else %}