Merge pull request #297 from liangliangyy/dev

时间增加默认值 close #292
sh_branch
且听风吟 7 years ago committed by GitHub
commit bc6bb78cbf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -204,7 +204,7 @@ EMAIL_HOST_PASSWORD = os.environ.get('DJANGO_EMAIL_PASSWORD')
DEFAULT_FROM_EMAIL = EMAIL_HOST_USER
SERVER_EMAIL = os.environ.get('DJANGO_EMAIL_USER')
# Setting debug=false did NOT handle except email notifications
ADMINS = [('liangliang', 'liangliangyy@gmail.com')]
ADMINS = [('admin', 'admin@admin.com')]
# WX ADMIN password(Two times md5)
WXADMIN = '995F03AC401D6CABABAEF756FC4D43C7'

@ -69,12 +69,13 @@ class Article(BaseModel):
)
title = models.CharField('标题', max_length=200, unique=True)
body = MDTextField('正文')
pub_time = models.DateTimeField('发布时间', blank=True, null=True)
pub_time = models.DateTimeField('发布时间', blank=False, null=False, default=now)
status = models.CharField('文章状态', max_length=1, choices=STATUS_CHOICES, default='p')
comment_status = models.CharField('评论状态', max_length=1, choices=COMMENT_STATUS, default='o')
type = models.CharField('类型', max_length=1, choices=TYPE, default='a')
views = models.PositiveIntegerField('浏览量', default=0)
author = models.ForeignKey(settings.AUTH_USER_MODEL, verbose_name='作者', on_delete=models.CASCADE)
author = models.ForeignKey(settings.AUTH_USER_MODEL, verbose_name='作者', blank=False, null=False,
on_delete=models.CASCADE)
article_order = models.IntegerField('排序,数字越大越靠前', blank=False, null=False, default=0)
category = models.ForeignKey('Category', verbose_name='分类', on_delete=models.CASCADE, blank=False, null=False)
tags = models.ManyToManyField('Tag', verbose_name='标签集合', blank=True)

Loading…
Cancel
Save