|
@@ -6,7 +6,7 @@ from django.core.paginator import Paginator
|
|
|
from django.db.models import Q
|
|
from django.db.models import Q
|
|
|
import markdown
|
|
import markdown
|
|
|
|
|
|
|
|
-from .models import ArticlePost
|
|
|
|
|
|
|
+from .models import ArticlePost, ArticleColumn
|
|
|
from .form import ArticlePostForm
|
|
from .form import ArticlePostForm
|
|
|
from comment.models import Comment
|
|
from comment.models import Comment
|
|
|
|
|
|
|
@@ -64,6 +64,8 @@ def article_create(request):
|
|
|
# 保存数据,但是暂时不提交到数据库中
|
|
# 保存数据,但是暂时不提交到数据库中
|
|
|
new_article = article_post_form.save(commit=False)
|
|
new_article = article_post_form.save(commit=False)
|
|
|
new_article.author = User.objects.get(id=request.user.id)
|
|
new_article.author = User.objects.get(id=request.user.id)
|
|
|
|
|
+ if request.POST['column'] != 'none':
|
|
|
|
|
+ new_article.column = ArticleColumn.objects.get(id=request.POST['column'])
|
|
|
# 将新文章保存到数据库中
|
|
# 将新文章保存到数据库中
|
|
|
new_article.save()
|
|
new_article.save()
|
|
|
return redirect("article:article_list")
|
|
return redirect("article:article_list")
|
|
@@ -74,7 +76,8 @@ def article_create(request):
|
|
|
else:
|
|
else:
|
|
|
# 创建表单类实例
|
|
# 创建表单类实例
|
|
|
article_post_form = ArticlePostForm()
|
|
article_post_form = ArticlePostForm()
|
|
|
- context = {'article_post_form': article_post_form}
|
|
|
|
|
|
|
+ columns = ArticleColumn.objects.all()
|
|
|
|
|
+ context = {'article_post_form': article_post_form, 'columns': columns}
|
|
|
# 返回模板
|
|
# 返回模板
|
|
|
return render(request, 'article/create.html', context)
|
|
return render(request, 'article/create.html', context)
|
|
|
|
|
|
|
@@ -107,13 +110,18 @@ def article_update(request, id):
|
|
|
if article_post_form.is_valid():
|
|
if article_post_form.is_valid():
|
|
|
article.title = request.POST['title']
|
|
article.title = request.POST['title']
|
|
|
article.body = request.POST['body']
|
|
article.body = request.POST['body']
|
|
|
|
|
+ if request.POST['column'] != 'none':
|
|
|
|
|
+ article.column = ArticleColumn.objects.get(id=request.POST['column'])
|
|
|
|
|
+ else:
|
|
|
|
|
+ article.column = None
|
|
|
article.save()
|
|
article.save()
|
|
|
return redirect("article:article_detail", id=id)
|
|
return redirect("article:article_detail", id=id)
|
|
|
else:
|
|
else:
|
|
|
return HttpResponse("表单内容有误,请重新填写")
|
|
return HttpResponse("表单内容有误,请重新填写")
|
|
|
else:
|
|
else:
|
|
|
article_post_form = ArticlePostForm()
|
|
article_post_form = ArticlePostForm()
|
|
|
- context = {'article': article, 'article_post_form': article_post_form}
|
|
|
|
|
|
|
+ columns = ArticleColumn.objects.all()
|
|
|
|
|
+ context = {'article': article, 'article_post_form': article_post_form, 'columns': columns}
|
|
|
return render(request, 'article/update.html', context)
|
|
return render(request, 'article/update.html', context)
|
|
|
else:
|
|
else:
|
|
|
return HttpResponse("你无权进行此操作")
|
|
return HttpResponse("你无权进行此操作")
|