修改部分model排序规则

liangliangyy · liangliangyy · commit a99d241fa7da · 2018-05-26T22:07:13.000+08:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -26,6 +26,7 @@ def __str__(self):
     class Meta:
         verbose_name = 'oauth用户'
         verbose_name_plural = verbose_name
+        ordering = ['-created_time']
 
 
 class OAuthConfig(models.Model):
@@ -53,3 +54,4 @@ def __str__(self):
     class Meta:
         verbose_name = 'oauth配置'
         verbose_name_plural = verbose_name
+        ordering = ['-created_time']
diff --git a/servermanager/models.py b/servermanager/models.py
@@ -30,3 +30,4 @@ def __str__(self):
     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
@@ -116,9 +116,9 @@
     </aside>
     <aside id="meta-2" class="widget widget_meta"><h3 class="widget-title">功能</h3>
         <ul>
-            <li><a href="{{ SITE_BASE_URL }}/admin/">管理站点</a></li>
+            <li><a href="{{ SITE_BASE_URL }}/admin/" rel="nofollow">管理站点</a></li>
             {% if user.is_authenticated %}
-                <li><a href="{% url "account:logout" %}">登出</a>
+                <li><a href="{% url "account:logout" %}" rel="nofollow">登出</a>
                 </li>
 
             {% else %}
diff --git a/templates/share_layout/footer.html b/templates/share_layout/footer.html
@@ -36,7 +36,7 @@
                     {{ BEIAN_CODE }}
                 </p>
             </a>
-            {% if BEIAN_CODE_GONGAN %}
+            {% if BEIAN_CODE_GONGAN and SHOW_GONGAN_CODE %}
                 {{ BEIAN_CODE_GONGAN |safe }}
             {% endif %}
         </div>

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,8 @@ def seo_processor(requests):`
`41`	`41`	`'OPEN_SITE_COMMENT': setting.open_site_comment,`
`42`	`42`	`'BEIAN_CODE': setting.beiancode,`
`43`	`43`	`'ANALYTICS_CODE': setting.analyticscode,`
`44`		`- "BEIAN_CODE_GONGAN": setting.gongan_beiancode`
	`44`	`+ "BEIAN_CODE_GONGAN": setting.gongan_beiancode,`
	`45`	`+ "SHOW_GONGAN_CODE": setting.show_gongan_code`
`45`	`46`
`46`	`47`	`}`
`47`	`48`	`cache.set(key, value, 60 * 60 * 10)`
Original file line number	Diff line number	Diff line change
`@@ -159,6 +159,7 @@ def load_sidebar(user):`
`159`	`159`	`'show_google_adsense': blogsetting.show_google_adsense,`
`160`	`160`	`'google_adsense_codes': blogsetting.google_adsense_codes,`
`161`	`161`	`'open_site_comment': blogsetting.open_site_comment,`
	`162`	`+ 'show_gongan_code': blogsetting.show_gongan_code,`
`162`	`163`	`'sidebar_tags': sidebar_tags,`
`163`	`164`	`'extra_sidebars': extra_sidebars`
`164`	`165`	`}`