Redirect /notes/ to /

[pcdenotes.git] / notes / views.py

diff --git a/notes/views.py b/notes/views.py
index a0a82bc7c68c2673feea3d174b7ae359063dadb3..bd2fd8208147108c35552f710750de364b8e66ac 100644 (file)
--- 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
 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):
 # 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)
 
     notes_count = Note.objects.filter(status=1).count()
     paginator = Paginator(notes, NOTES_PER_PAGE)
 


@@ -17,11 +18,16 @@ def note_list(request):
         page_number = int(request.GET.get('page'))
     except:
         pass
         page_number = int(request.GET.get('page'))
     except:
         pass

+
+    page_count = paginator.num_pages

     
     notes_page = paginator.get_page(page_number)
 
     
     notes_page = paginator.get_page(page_number)
 

-    return render(request, 'note_list.html', {'notes_page': notes_page, 'notes_count': notes_count, 'pages': paginator, 'page_number': page_number})
+    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):
 
 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
     return render(request, 'note_detail.html', {'note': note})
\ No newline at end of file