Skip to content

Commit a99d241

Browse files
committed
修改部分model排序规则
1 parent 7be6ddb commit a99d241

File tree

9 files changed

+12
-5
lines changed

9 files changed

+12
-5
lines changed

DjangoBlog/utils.py

+1
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,7 @@ def get_blog_setting():
194194
setting.open_site_comment = True
195195
setting.analyticscode = ''
196196
setting.beiancode = ''
197+
setting.show_gongan_code = False
197198
setting.save()
198199
value = BlogSettings.objects.first()
199200
logger.info('set cache get_blog_setting')

blog/context_processors.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ def seo_processor(requests):
4141
'OPEN_SITE_COMMENT': setting.open_site_comment,
4242
'BEIAN_CODE': setting.beiancode,
4343
'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
4546

4647
}
4748
cache.set(key, value, 60 * 60 * 10)

blog/models.py

+1
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,7 @@ class BlogSettings(models.Model):
247247
open_site_comment = models.BooleanField('是否打开网站评论功能', default=True)
248248
beiancode = models.CharField('备案号', max_length=2000, null=True, blank=True, default='')
249249
analyticscode = models.TextField("网站统计代码", max_length=1000, null=False, blank=False, default='')
250+
show_gongan_code = models.BooleanField('是否显示公安备案号', default=False, null=False)
250251
gongan_beiancode = models.TextField('公安备案号', max_length=2000, null=True, blank=True, default='')
251252

252253
class Meta:

blog/templatetags/blog_tags.py

+1
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ def load_sidebar(user):
159159
'show_google_adsense': blogsetting.show_google_adsense,
160160
'google_adsense_codes': blogsetting.google_adsense_codes,
161161
'open_site_comment': blogsetting.open_site_comment,
162+
'show_gongan_code': blogsetting.show_gongan_code,
162163
'sidebar_tags': sidebar_tags,
163164
'extra_sidebars': extra_sidebars
164165
}

comments/models.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class Comment(models.Model):
1717
is_enable = models.BooleanField('是否显示', default=True, blank=False, null=False)
1818

1919
class Meta:
20-
ordering = ['created_time']
20+
ordering = ['-created_time']
2121
verbose_name = "评论"
2222
verbose_name_plural = verbose_name
2323
get_latest_by = 'created_time'

oauth/models.py

+2
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ def __str__(self):
2626
class Meta:
2727
verbose_name = 'oauth用户'
2828
verbose_name_plural = verbose_name
29+
ordering = ['-created_time']
2930

3031

3132
class OAuthConfig(models.Model):
@@ -53,3 +54,4 @@ def __str__(self):
5354
class Meta:
5455
verbose_name = 'oauth配置'
5556
verbose_name_plural = verbose_name
57+
ordering = ['-created_time']

servermanager/models.py

+1
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,4 @@ def __str__(self):
3030
class Meta:
3131
verbose_name = '邮件发送log'
3232
verbose_name_plural = verbose_name
33+
ordering = ['-created_time']

templates/blog/tags/sidebar.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,9 @@
116116
</aside>
117117
<aside id="meta-2" class="widget widget_meta"><h3 class="widget-title">功能</h3>
118118
<ul>
119-
<li><a href="{{ SITE_BASE_URL }}/admin/">管理站点</a></li>
119+
<li><a href="{{ SITE_BASE_URL }}/admin/" rel="nofollow">管理站点</a></li>
120120
{% if user.is_authenticated %}
121-
<li><a href="{% url "account:logout" %}">登出</a>
121+
<li><a href="{% url "account:logout" %}" rel="nofollow">登出</a>
122122
</li>
123123

124124
{% else %}

templates/share_layout/footer.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
{{ BEIAN_CODE }}
3737
</p>
3838
</a>
39-
{% if BEIAN_CODE_GONGAN %}
39+
{% if BEIAN_CODE_GONGAN and SHOW_GONGAN_CODE %}
4040
{{ BEIAN_CODE_GONGAN |safe }}
4141
{% endif %}
4242
</div>

0 commit comments

Comments
 (0)