X-Git-Url: https://git.p6c8.net/pcdenotes.git/blobdiff_plain/f99300eecfd92abe9b7b442456694950fb3c54fa..71736b7bbf3c025b7dc5f85fce395b1b0591265b:/notes/views.py?ds=sidebyside diff --git a/notes/views.py b/notes/views.py index 793f9ed..bd2fd82 100644 --- a/notes/views.py +++ b/notes/views.py @@ -1,4 +1,4 @@ -from django.shortcuts import render, get_object_or_404 +from django.shortcuts import render, get_object_or_404, redirect from django.core.paginator import Paginator from pcdenotes.settings import NOTES_PER_PAGE @@ -7,7 +7,8 @@ from .models import Note # Create your views here. def note_list(request): - notes = Note.objects.filter(status=1) + notes = Note.objects.all() if request.user.is_staff else Note.objects.filter(status=1) + notes_count = Note.objects.filter(status=1).count() paginator = Paginator(notes, NOTES_PER_PAGE) @@ -24,6 +25,9 @@ def note_list(request): return render(request, 'note_list.html', {'notes_page': notes_page, 'notes_count': notes_count, 'pages': paginator, 'page_number': page_number, 'page_count': page_count}) +def note_redirect(request): + return redirect('notes:note_list', permanent=True) + def note_detail(request, note_slug): - note = get_object_or_404(Note, slug=note_slug, status=1) + note = get_object_or_404(Note, slug=note_slug) if request.user.is_staff else get_object_or_404(Note, slug=note_slug, status=1) return render(request, 'note_detail.html', {'note': note}) \ No newline at end of file