Merge branch 'haow/dev' into 'master'

fix pictorial batch update

See merge request alpha/sun!145

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