Merge branch 'master' of http://git.wanmeizhensuo.com/alpha/sun into haow/dev

api/reply.py

@@ -86,7 +86,7 @@ class ReplyManageListView(APIView):
     def get(self, request):
         page = int(request.GET.get('page', 1))
         limit = int(request.GET.get('limit', 10))
-        id_ = request.GET.get('id', None)
+        topic_id = request.GET.get('topic_id', None)
         content = request.GET.get('content', None)
         topic_content = request.GET.get('topic_content', None)
         user_name = request.GET.get('user_name', None)
@@ -117,8 +117,8 @@ class ReplyManageListView(APIView):
         if user_name:
             other_filters['user_name'] = user_name
         filters = {}
-        if id_:
-            filters['id'] = int(id_)
+        if topic_id:
+            filters['topic_id'] = int(topic_id)
         if content:
             filters['content__contains'] = content.strip()
         if belong_type:

api/user.py

@@ -95,10 +95,10 @@ class UserUpdateOrCreate(APIView):
 
 class PictorialUserList(APIView):
     def get(self, request):
-        id_ = request.GET.get('id')
+        id_ = request.GET.get('pictorial_id')
         offset = int(request.GET.get('page', 0))
         count = int(request.GET.get('limit', 10))
-        filters = {'pictorial_id': id_}
+        filters = {'pictorial_id': id_, 'is_online': True}
         try:
             data = self.rpc['venus/sun/pictorial/user/list'](filters=filters, offset=(offset - 1) * count, count=count).unwrap()
         except Exception as e: