bug修复:修改Article的get_serialize，在个人主页里添加文章类别，比如［书评］

Author: yhzhang0128

xichao/models.py

@@ -280,7 +280,7 @@ class Article(Base,AutoSerialize):
         'mysql_engine': 'InnoDB',
         'mysql_charset': 'utf8'
     }
-    __allowed_in_json__ = ['title','article_id','picture','time','comment_num','coins']
+    __allowed_in_json__ = ['category', 'title','article_id','picture','time','comment_num','coins']
     ########## Primary索引 ##########
     article_id = Column(Integer, primary_key=True, autoincrement=True, 
                                  nullable=False, index=True)

xichao/templates/layout_home_page_new.html

@@ -469,8 +469,16 @@
 
 				text = "<div class='content-box'><div class='table-layout'>";
 				for(var i = 0; i < items.length; ++i){
+					val_category = "书评";
+					if (items[i].category == "2"){
+						val_category = "影评";
+					}
+					if (items[i].category == "3"){
+						val_category = "杂文";
+					}
+
 					text += "<div class='table-row'>\
-								<div class='table-cell col-1'><a href='/article/"+items[i].article_id + "'>"+"【" + items[i].category+"】 "+items[i].title + "</a></div>\
+								<div class='table-cell col-1'><a href='/article/"+items[i].article_id + "'>"+"【" + val_category+"】 "+items[i].title + "</a></div>\
 								<div class='table-cell col-2'>评论&nbsp;(" + items[i].comment_num + ")</div>\
 								<div class='table-cell col-3'><img src='/static/images/coins.png'>&nbsp;" + items[i].coins + "</div>\
 								<div class='table-cell col-4'><a onclick='homepage_delete(\"" + category + "\"," + items[i].article_id + "," + page_id + "," + items.length + ")'>删除</a></div>\
@@ -1409,8 +1417,16 @@
 
 				text = "<div class='content-box'><div class='table-layout'>";
 				for(var i = 0; i < items.length; ++i){
+					val_category = "书评";
+					if (items[i].category == "2"){
+						val_category = "影评";
+					}
+					if (items[i].category == "3"){
+						val_category = "杂文";
+					}
+
 					text += "<div class='table-row'>\
-								<div class='table-cell col-1'><a href='/article/" + items[i].article_id + "'>"+"【" + items[i].category+"】 "+items[i].title + "</a></div>\
+								<div class='table-cell col-1'><a href='/article/" + items[i].article_id + "'>"+"【" + val_category+"】 "+items[i].title + "</a></div>\
 								<div class='table-cell col-2'>评论&nbsp;(" + items[i].comment_num + ")</div>\
 								<div class='table-cell col-3'><img src='/static/images/coins.png'>&nbsp;" + items[i].coins + "</div>\
 							</div>";

xichao/views.py

@@ -1483,11 +1483,7 @@ def ajax_home_page_article(page_id):
     else:
         sort_by=False
     pagination=get_article_pagination_by_user_id(current_user.user_id,sort_by,page_id)
-    rows = []
-    for item in pagination.items:
-        tmp = item.get_serialize()
-        tmp["category"] = CATEGORY[int(item.category)-1]
-        rows.append(tmp)
+    rows = [item.get_serialize() for item in pagination.items]
 
     has_prev=get_has_prev(pagination)
     has_next=get_has_next(pagination)
@@ -1886,11 +1882,7 @@ def ajax_article_pagination_by_coins(user_id,page_id):
     has_next=get_has_next(article_pagination)
     page=str(article_pagination.page)
     pages=str(article_pagination.pages)
-    rows=[]
-    for article in article_pagination.items:
-        tmp = article.get_serialize()
-        tmp["category"] = CATEGORY[int(article.category)-1]
-        rows.append(tmp)
+    rows=[article.get_serialize() for article in article_pagination.items]
     return jsonify(has_prev=has_prev,has_next=has_next,page=page,pages=pages,rows=rows)
 
 @app.route('/user/<int:user_id>/article/pagination/by_time/page/<int:page_id>',methods=['GET'])
@@ -1901,11 +1893,7 @@ def ajax_article_pagination_by_time(user_id,page_id):
     has_next=get_has_next(article_pagination)
     page=str(article_pagination.page)
     pages=str(article_pagination.pages)
-    rows=[]
-    for article in article_pagination.items:
-        tmp = article.get_serialize()
-        tmp["category"] = CATEGORY[int(article.category)-1]
-        rows.append(tmp)
+    rows=[article.get_serialize() for article in article_pagination.items]
     return jsonify(has_prev=has_prev,has_next=has_next,page=page,pages=pages,rows=rows)