Skip to content

Commit a4f6f49

Browse files
author
zmrenwu
committed
修复 markdown 渲染乱码的问题
1 parent c568f25 commit a4f6f49

File tree

5 files changed

+368
-6
lines changed

5 files changed

+368
-6
lines changed

blog/models.py

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
from django.db import models
2-
from django.db.models import F
32
from django.core.urlresolvers import reverse
43
from django.conf import settings
54

@@ -14,8 +13,10 @@ class Article(models.Model):
1413
body = models.TextField('正文')
1514
created_time = models.DateTimeField('创建时间', auto_now_add=True)
1615
last_mod_time = models.DateTimeField('修改时间', auto_now=True)
16+
pub_time = models.DateTimeField('发布时间', blank=True, null=True,
17+
help_text="不指定发布时间则视为草稿,可以指定未来时间,到时将自动发布。")
1718
status = models.CharField('文章状态', max_length=1, choices=STATUS_CHOICES)
18-
abstract = models.CharField('摘要', max_length=200, blank=True, help_text="可选,若为空将摘取正文的前54个字符。")
19+
summary = models.CharField('摘要', max_length=200, blank=True, help_text="可选,若为空将摘取正文的前54个字符。")
1920
views = models.PositiveIntegerField('浏览量', default=0)
2021
author = models.ForeignKey(settings.AUTH_USER_MODEL, verbose_name='作者', on_delete=models.CASCADE)
2122

@@ -26,13 +27,15 @@ def __str__(self):
2627
return self.title
2728

2829
class Meta:
29-
ordering = ['-created_time']
30+
ordering = ['-pub_time']
31+
verbose_name = "文章"
32+
verbose_name_plural = verbose_name
3033

3134
def get_absolute_url(self):
3235
return reverse('blog:detail', kwargs={'article_id': self.pk})
3336

3437
def save(self, *args, **kwargs):
35-
self.abstract = self.abstract or self.body[:120]
38+
self.summary = self.summary or self.body[:120]
3639
super().save(*args, **kwargs)
3740

3841
def viewed(self):
@@ -45,6 +48,11 @@ class Category(models.Model):
4548
created_time = models.DateTimeField('创建时间', auto_now_add=True)
4649
last_mod_time = models.DateTimeField('修改时间', auto_now=True)
4750

51+
class Meta:
52+
ordering = ['name']
53+
verbose_name = "分类"
54+
verbose_name_plural = verbose_name
55+
4856
def __str__(self):
4957
return self.name
5058

@@ -56,3 +64,8 @@ class Tag(models.Model):
5664

5765
def __str__(self):
5866
return self.name
67+
68+
class Meta:
69+
ordering = ['name']
70+
verbose_name = "标签"
71+
verbose_name_plural = verbose_name

0 commit comments

Comments
 (0)