|
|
@@ -1,13 +1,15 @@
|
|
|
from django.shortcuts import render, redirect
|
|
|
from django.http import HttpResponse
|
|
|
-from .models import ArticlePost
|
|
|
-from .form import ArticlePostForm
|
|
|
from django.contrib.auth.models import User
|
|
|
from django.contrib.auth.decorators import login_required
|
|
|
from django.core.paginator import Paginator
|
|
|
from django.db.models import Q
|
|
|
import markdown
|
|
|
|
|
|
+from .models import ArticlePost
|
|
|
+from .form import ArticlePostForm
|
|
|
+from comment.models import CommentPost
|
|
|
+
|
|
|
|
|
|
# 视图函数
|
|
|
def article_list(request):
|
|
|
@@ -39,6 +41,7 @@ def article_list(request):
|
|
|
|
|
|
def article_detail(request, id):
|
|
|
articles = ArticlePost.objects.get(id=id)
|
|
|
+ comments = CommentPost.objects.filter(article=id)
|
|
|
articles.total_views += 1
|
|
|
articles.save(update_fields=['total_views'])
|
|
|
md = markdown.Markdown(
|
|
|
@@ -48,7 +51,7 @@ def article_detail(request, id):
|
|
|
'markdown.extensions.toc'
|
|
|
])
|
|
|
articles.body = md.convert(articles.body)
|
|
|
- context = {'article': articles, 'toc': md.toc}
|
|
|
+ context = {'article': articles, 'toc': md.toc, 'comments': comments}
|
|
|
return render(request, 'article/detail.html', context)
|
|
|
|
|
|
|