prod

blog/controller/article.py

@@ -220,7 +220,7 @@ def set_tag(articles):
 
 def get_article(top: int = -1, page: int = -1, is_paginator: bool = False, category: models.Category = None,
                 tag: models.Tags = None, search_title: str = None, search_content: str = None, date_record: str = None):
-    if category is None and tag is None:
+    if category is None and tag is None and date_record is None:
         search_dict = dict()
         if search_title:
             search_dict['title__contains'] = search_title

blog/templatetags/day_util.py

@@ -16,4 +16,6 @@ def days_until(date):
         return '昨天' + date_str
     elif (day / 365) >= 1:
         return str(int((day / 365))) + '年前'
+    elif (day / 30) >= 1:
+        return str(int((day / 30))) + '个月前'
     return str(day) + '天前'

blog/views.py

@@ -64,7 +64,7 @@ order by count desc limit 10'''
 
 
 def get_record_and_tags():
-    article_sql = '''SELECT count(*) as count,strftime('%Y-%m',created_time) as datetime FROM blog_article group by strftime('%Y,%m',created_time)'''
+    article_sql = '''SELECT count(*) as count,strftime('%Y-%m',created_time) as datetime FROM blog_article group by strftime('%Y,%m',created_time) order by created_time desc'''
     tag_sql = '''SELECT bt.id,bt.name,count() as count FROM blog_tags bt  left join blog_article_tags bat on bt.id = bat.tags_id group by bt.name
     order by count desc limit 10'''
     cursor = connection.cursor()