X-Git-Url: https://git.p6c8.net/pcdenotes.git/blobdiff_plain/938098389e8f0871a23d193a710c332ea3344eec..ea42484857450eaf9252f0bedff627be1df885a1:/notes/views.py?ds=sidebyside

diff --git a/notes/views.py b/notes/views.py
index c89d096..62a51e8 100644
--- a/notes/views.py
+++ b/notes/views.py
@@ -34,11 +34,11 @@ def note_detail(request, note_slug):
     return render(request, 'note_detail.html', {'note': note})
 
 def archive_main(request):
-    notes_years = Note.objects.filter(status=1).annotate(created_year=ExtractYear('created_at')).values_list('created_year', flat=True).distinct().order_by('created_year')
+    notes_years = Note.objects.years_with_total()
     return render(request, 'archive_main.html', {'years': notes_years})
 
 def archive_year(request, archive_year):
-    notes_months = Note.objects.per_year(archive_year).annotate(created_month=ExtractMonth('created_at')).values_list('created_month', flat=True).distinct().order_by('created_month')
+    notes_months = Note.objects.months_with_total(archive_year)
     return render(request, 'archive_year.html', {'year': archive_year, 'months': notes_months})
 
 def archive_month(request, archive_year, archive_month):