From a99d241fa7dacdd2b19b9ffaaa5c763ae69cdd34 Mon Sep 17 00:00:00 2001 From: liangliang Date: Sat, 26 May 2018 22:07:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86model?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DjangoBlog/utils.py | 1 + blog/context_processors.py | 3 ++- blog/models.py | 1 + blog/templatetags/blog_tags.py | 1 + comments/models.py | 2 +- oauth/models.py | 2 ++ servermanager/models.py | 1 + templates/blog/tags/sidebar.html | 4 ++-- templates/share_layout/footer.html | 2 +- 9 files changed, 12 insertions(+), 5 deletions(-) diff --git a/DjangoBlog/utils.py b/DjangoBlog/utils.py index 6b4815d..96d792d 100644 --- a/DjangoBlog/utils.py +++ b/DjangoBlog/utils.py @@ -194,6 +194,7 @@ def get_blog_setting(): setting.open_site_comment = True setting.analyticscode = '' setting.beiancode = '' + setting.show_gongan_code = False setting.save() value = BlogSettings.objects.first() logger.info('set cache get_blog_setting') diff --git a/blog/context_processors.py b/blog/context_processors.py index 05882d6..27c9cc2 100644 --- a/blog/context_processors.py +++ b/blog/context_processors.py @@ -41,7 +41,8 @@ def seo_processor(requests): 'OPEN_SITE_COMMENT': setting.open_site_comment, 'BEIAN_CODE': setting.beiancode, 'ANALYTICS_CODE': setting.analyticscode, - "BEIAN_CODE_GONGAN": setting.gongan_beiancode + "BEIAN_CODE_GONGAN": setting.gongan_beiancode, + "SHOW_GONGAN_CODE": setting.show_gongan_code } cache.set(key, value, 60 * 60 * 10) diff --git a/blog/models.py b/blog/models.py index d943952..aa70479 100644 --- a/blog/models.py +++ b/blog/models.py @@ -247,6 +247,7 @@ class BlogSettings(models.Model): open_site_comment = models.BooleanField('是否打开网站评论功能', default=True) beiancode = models.CharField('备案号', max_length=2000, null=True, blank=True, default='') analyticscode = models.TextField("网站统计代码", max_length=1000, null=False, blank=False, default='') + show_gongan_code = models.BooleanField('是否显示公安备案号', default=False, null=False) gongan_beiancode = models.TextField('公安备案号', max_length=2000, null=True, blank=True, default='') class Meta: diff --git a/blog/templatetags/blog_tags.py b/blog/templatetags/blog_tags.py index ac5a57e..c6695c3 100644 --- a/blog/templatetags/blog_tags.py +++ b/blog/templatetags/blog_tags.py @@ -159,6 +159,7 @@ def load_sidebar(user): 'show_google_adsense': blogsetting.show_google_adsense, 'google_adsense_codes': blogsetting.google_adsense_codes, 'open_site_comment': blogsetting.open_site_comment, + 'show_gongan_code': blogsetting.show_gongan_code, 'sidebar_tags': sidebar_tags, 'extra_sidebars': extra_sidebars } diff --git a/comments/models.py b/comments/models.py index 9934ba4..177c3ed 100644 --- a/comments/models.py +++ b/comments/models.py @@ -17,7 +17,7 @@ class Comment(models.Model): is_enable = models.BooleanField('是否显示', default=True, blank=False, null=False) class Meta: - ordering = ['created_time'] + ordering = ['-created_time'] verbose_name = "评论" verbose_name_plural = verbose_name get_latest_by = 'created_time' diff --git a/oauth/models.py b/oauth/models.py index 25089b5..9527d78 100644 --- a/oauth/models.py +++ b/oauth/models.py @@ -26,6 +26,7 @@ class OAuthUser(models.Model): class Meta: verbose_name = 'oauth用户' verbose_name_plural = verbose_name + ordering = ['-created_time'] class OAuthConfig(models.Model): @@ -53,3 +54,4 @@ class OAuthConfig(models.Model): class Meta: verbose_name = 'oauth配置' verbose_name_plural = verbose_name + ordering = ['-created_time'] diff --git a/servermanager/models.py b/servermanager/models.py index 7c99e17..f75c930 100644 --- a/servermanager/models.py +++ b/servermanager/models.py @@ -30,3 +30,4 @@ class EmailSendLog(models.Model): class Meta: verbose_name = '邮件发送log' verbose_name_plural = verbose_name + ordering = ['-created_time'] diff --git a/templates/blog/tags/sidebar.html b/templates/blog/tags/sidebar.html index dd25e42..f78794f 100755 --- a/templates/blog/tags/sidebar.html +++ b/templates/blog/tags/sidebar.html @@ -116,9 +116,9 @@