Commit 1af8141e authored by 王鹏's avatar 王鹏

Merge branch 'feature_wp_pictorial' into 'test'

Feature wp pictorial

See merge request alpha/sun!331
parents 57d886d7 2e8ce480
...@@ -51,6 +51,9 @@ class PictorialUpdateOrCreate(APIView): ...@@ -51,6 +51,9 @@ class PictorialUpdateOrCreate(APIView):
pictorial_user_ids = json.loads(request.POST.get('pictorial_user_ids', '[]')) pictorial_user_ids = json.loads(request.POST.get('pictorial_user_ids', '[]'))
collection_tag_ids = json.loads(request.POST.get('collection_tag_ids', '[]')) collection_tag_ids = json.loads(request.POST.get('collection_tag_ids', '[]'))
pictorial_activity_id = request.POST.get('pictorial_activity_id') pictorial_activity_id = request.POST.get('pictorial_activity_id')
tab_config = request.POST.get("tab_config")
if tab_config:
tab_config = []
data = { data = {
'name': request.POST.get('name', ''), 'name': request.POST.get('name', ''),
'description': request.POST.get('description', ''), 'description': request.POST.get('description', ''),
...@@ -69,7 +72,7 @@ class PictorialUpdateOrCreate(APIView): ...@@ -69,7 +72,7 @@ class PictorialUpdateOrCreate(APIView):
'pictorial_activity_ids': [int(pictorial_activity_id)] if pictorial_activity_id else [], 'pictorial_activity_ids': [int(pictorial_activity_id)] if pictorial_activity_id else [],
'alias': request.POST.get('alias', ''), 'alias': request.POST.get('alias', ''),
'comment_talk': request.POST.get('pictorial_comment_talk', ''), 'comment_talk': request.POST.get('pictorial_comment_talk', ''),
'tab_config': json.loads(tab_config),
} }
try: try:
data = self.rpc['venus/sun/pictorial/edit'](id=id, data=data).unwrap() data = self.rpc['venus/sun/pictorial/edit'](id=id, data=data).unwrap()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment