Merge branch 'haow/dev' into 'test'

fix topic list

See merge request alpha/sun!176

api/tools.py

@@ -56,10 +56,8 @@ class BatchUpdateTopicTag(APIView):
             if index == len(rows_data) - 1:
                 topic_infos.append(topic_tag_info)
             if item.startswith('http:'):
-                print(item)
                 if topic_tag_info.get('url'):
                     topic_infos.append(topic_tag_info)
-                    print(topic_tag_info)
                 
                 topic_tag_info = {}
                 topic_tag_info['url'] = item.split('-')[0].replace('http://alpha.iyanzhi.com/', '')

api/topic.py

@@ -26,7 +26,7 @@ class TopicListView(APIView):
             if int(drop_score) == 0:
                 filters.update({'drop_score': int(drop_score)})
             elif int(drop_score) == 1:
-                filters.update({'drop_score__gt': int(drop_score)})
+                filters.update({'drop_score__exclude': int(drop_score)})
 
         res = self.rpc['physical/search/business/topic'](
             offset=(page-1) * limit,

api/urls.py

@@ -134,16 +134,17 @@ urlpatterns = [
     url(r'^pictorial/topics$', PictorialTopics.as_view()),
     url(r'^pictorial/user/list$', PictorialUserList.as_view()),
 
-    # 工具
-    url(r'^tools/virtual_vote$', VirtualVote.as_view()),
-    url(r'^tools/batch_update_topic_tag$', BatchUpdateTopicTag.as_view()),
-
     #运营位
     url(r'^topic/home_recommend/list', TopicHomeRecommendList.as_view()),
     url(r'^topic/home_recommend/edit', TopicHomeRecommendEdit.as_view()),
     url(r'^operation/home_fix', TopicHomeFixOperation.as_view()),
     url(r'^operation/pictorial/recommend/list', PictorialHomeRecommendList.as_view()),
     url(r'^operation/pictorial/recommend/update', PictorialHomeRecommendUpdate.as_view()),
+
+    # 工具
+    url(r'^tools/virtual_vote$', VirtualVote.as_view()),
+    url(r'^tools/batch_update_topic_tag$', BatchUpdateTopicTag.as_view()),
+
 ]
 
 search_urlpatterns = [