X-Git-Url: https://git.p6c8.net/pcdenotes.git/blobdiff_plain/b0b5f36f4e346fea5edde6c1796b4632320bc0af..938098389e8f0871a23d193a710c332ea3344eec:/notes/views.py diff --git a/notes/views.py b/notes/views.py index 2c79254..c89d096 100644 --- a/notes/views.py +++ b/notes/views.py @@ -38,9 +38,9 @@ def archive_main(request): return render(request, 'archive_main.html', {'years': notes_years}) def archive_year(request, archive_year): - notes_months = Note.objects.filter(status=1, created_at__year=archive_year).annotate(created_month=ExtractMonth('created_at')).values_list('created_month', flat=True).distinct().order_by('created_month') + 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') return render(request, 'archive_year.html', {'year': archive_year, 'months': notes_months}) def archive_month(request, archive_year, archive_month): - notes = Note.objects.filter(status=1, created_at__year=archive_year, created_at__month=archive_month) + notes = Note.objects.per_month(archive_year, archive_month) return render(request, 'archive_month.html', {'year': archive_year, 'month': archive_month, 'notes': notes}) \ No newline at end of file