Merge branch 'master' of git.wanmeizhensuo.com:alpha/sun

api/pictorial.py

@@ -23,7 +23,7 @@ class PictorialListView(APIView):
 
     def post(self, request):
         ids = json.loads(request.POST.get('ids', '[]'))
-        updates = json.loads(request.POST.get('updates', '{}'))
+        updates = json.loads(request.POST.get('update', '{}'))
         try:
             self.rpc['venus/sun/pictorial/batch/update'](updates=updates, ids=ids).unwrap()
         except Exception as e:

api/push.py

@@ -41,7 +41,7 @@ class PushUpdateOrCreateView(APIView):
         url = request.POST.get('url', '')
         if url == '推送帖子':
             url = 'alpha://topic_detail?topic_id='
-        elif url == '推送小组':
+        elif url == '推送画报':
             url = 'alpha://pictorial_detail?pictorial_id='
         full_url = url + pictorial_topic_id
 

api/search.py

@@ -35,7 +35,7 @@ class TagSearchView(APIView):
     def get(self, request):
         offset, count = get_offset_count(request)
         name = request.GET.get('name')
-        platform = request.GET.get('platform')
+        platform = None  # request.GET.get('platform')
         collection = request.GET.get('collection')
         try:
             data = self.rpc['venus/sun/tag/search'](offset=offset, count=count, name=name, platform=platform, collection=collection).unwrap()
@@ -93,7 +93,7 @@ class TagTypeSearchView(APIView):
             'data': ['{id}:{name}'.format(id=search_data['id'], name=search_data['name']) for search_data in data]
         }
 
-    
+
 class PictorialSearchView(APIView):
     def get(self, request):
         name = request.GET.get('name')

api/tag.py

@@ -67,7 +67,7 @@ class TagUpdateOrCreateView(APIView):
         try:
             data = self.rpc['venus/sun/tag/edit'](id=id, data=data).unwrap()
         except Exception as e:
-            error_logger.error(u'创建/编辑标签%d信息失败%s' % (id, e))
+            error_logger.error(u'创建/编辑标签%s信息失败%s' % (id, e))
             raise
         return data