Merge branch 'haow/dev' into 'test'

Haow/dev

See merge request alpha/sun!144

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/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
 

api/user.py

@@ -72,7 +72,7 @@ class UserUpdateOrCreate(APIView):
             'phone': request.POST.get('phone'),
             'email': request.POST.get('email'),
             'gender': request.POST.get('gender'),
-            'is_tcc': int(request.POST.get('is_tcc')),
+            'is_tcc': int(request.POST.get('is_tcc', 0)),
         }
 
         try: