From a2252bd5ef3c99885e439ab34cf93871cdeb95d3 Mon Sep 17 00:00:00 2001 From: Anna Date: Sun, 5 Nov 2017 00:34:26 +0300 Subject: [PATCH] UPD --- blog/templates/blog/base.html | 9 ++++++++- blog/templates/blog/post_list.html | 1 - blog/urls.py | 1 + blog/views.py | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/blog/templates/blog/base.html b/blog/templates/blog/base.html index fdcc56a..cf23131 100644 --- a/blog/templates/blog/base.html +++ b/blog/templates/blog/base.html @@ -18,7 +18,7 @@ -
+ {% endblock content %} diff --git a/blog/urls.py b/blog/urls.py index 988446d..525156a 100644 --- a/blog/urls.py +++ b/blog/urls.py @@ -2,6 +2,7 @@ from django.conf.urls import url from . import views urlpatterns = [ + url(r'^$', views.post_list, name='post_list'), url(r'^(?P[0-9]+)/$', views.post_list, name='post_list'), url(r'^post/(?P[0-9]+)/$', views.post_detail, name='post_detail'), url(r'^new/$', views.post_new, name='post_new'), diff --git a/blog/views.py b/blog/views.py index 2002cf3..7a17bd8 100644 --- a/blog/views.py +++ b/blog/views.py @@ -8,7 +8,7 @@ from .forms import PostForm from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger from django.contrib.auth.decorators import login_required -def post_list(request, page): +def post_list(request, page='1'): post_list = Post.objects.filter(published_date__lte=timezone.now()).order_by('-published_date')#[int(page)*5-5:int(page)*5] paginator = Paginator(post_list, 5) page = request.GET.get('page')