Some refactoring of the model manager methods

[pcdenotes.git] / notes / views.py

diff --git a/notes/views.py b/notes/views.py
index c6f2e26966407bb3f51b6d97367b3a19e174a42e..19ace1323137b0fd9856cc1bbedeb664bfa9cdb7 100644 (file)
--- a/notes/views.py
+++ b/notes/views.py
@@ -8,7 +8,7 @@ from .models import Note
 # Create your views here.
 
 def note_list(request):
 # Create your views here.
 
 def note_list(request):

-    notes = Note.objects.all() if request.user.is_staff else Note.objects.filter(status=1)
+    notes = Note.objects.all() if request.user.is_staff else Note.objects.all_published()

 
     notes_count = notes.count()
     paginator = Paginator(notes, NOTES_PER_PAGE)
 
     notes_count = notes.count()
     paginator = Paginator(notes, NOTES_PER_PAGE)


@@ -34,11 +34,11 @@ def note_detail(request, note_slug):
     return render(request, 'note_detail.html', {'note': note})
 
 def archive_main(request):
     return render(request, 'note_detail.html', {'note': note})
 
 def archive_main(request):

-    notes_years = Note.objects.years()
+    notes_years = Note.objects.years_with_total()

     return render(request, 'archive_main.html', {'years': notes_years})
 
 def archive_year(request, archive_year):
     return render(request, 'archive_main.html', {'years': notes_years})
 
 def archive_year(request, archive_year):

-    notes_months = Note.objects.months(archive_year)
+    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):
     return render(request, 'archive_year.html', {'year': archive_year, 'months': notes_months})
 
 def archive_month(request, archive_year, archive_month):