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

api/tag.py

@@ -61,7 +61,8 @@ class TagUpdateOrCreateView(APIView):
             'icon_url': request.POST.get('icon_url', '')[:-2],
             'platform': request.POST.get('platform'),
             'collection': request.POST.get('collection'),
-            'alias': request.POST.get('alias')
+            'alias': request.POST.get('alias'),
+            'is_show_in_register': request.POST.get('is_show_in_register')
         }
         try:
             data = self.rpc['venus/sun/tag/edit'](id=id, data=data).unwrap()
@@ -122,3 +123,24 @@ class TagTypeUpdateOrCreateView(APIView):
             error_logger.error(u'创建/编辑标签类型%d信息失败%s' % (id, e))
             raise
         return data
+
+
+class TagRegisterUpdateView(APIView):
+
+    def get(self, request):
+        data = {}
+        try:
+            data = self.rpc['venus/sun/tag/register_tag/get']().unwrap()
+        except Exception as e:
+            error_logger.error(u'拉取信息失败')
+            raise
+        return data
+
+    def post(self, request):
+        ids = request.POST.get('tag_ids')
+        try:
+            self.rpc['venus/sun/tag/register_tag/update'](ids=ids).unwrap()
+        except Exception as e:
+            error_logger.error(u'配置失败')
+            raise
+        return {'msg': '更改成功'}

api/urls.py

@@ -84,6 +84,7 @@ urlpatterns = [
     url(r'^tag/list/update$', TagListView.as_view()),
     url(r'^tag/create$', TagUpdateOrCreateView.as_view()),
     url(r'^tag/detail$', TagUpdateOrCreateView.as_view()),
+    url(r'^tag/register_show/update$', TagRegisterUpdateView.as_view()),
 
     # 标签类型相关
     url(r'^tag/tagtype/list$', TagTypeListView.as_view()),