Skip to content

S
sun
Commit d1646d6b authored by yangchenglin's avatar yangchenglin
Browse files
Options

conflict

parents 31260d9d 99ecf7f9
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
api/activity.py
View file @ d1646d6b
...@@ -80,7 +80,7 @@ class PictorialActivityListView(APIView): ...@@ -80,7 +80,7 @@ class PictorialActivityListView(APIView):
def get(self, request): def get(self, request):
name = request.GET.get('name') name = request.GET.get('name', '')
page = int(request.GET.get('page', 1)) page = int(request.GET.get('page', 1))
count = int(request.GET.get('count', 10)) count = int(request.GET.get('count', 10))
...@@ -107,12 +107,12 @@ class PictorialActivityView(APIView): ...@@ -107,12 +107,12 @@ class PictorialActivityView(APIView):
data = { data = {
"id": request.POST.get('id'), "id": request.POST.get('id'),
"name": request.POST.get('name', None), "name": request.POST.get('name', ''),
"start_time": request.POST.get('start_time'), "start_time": request.POST.get('start_time'),
"end_time": request.POST.get('end_time'), "end_time": request.POST.get('end_time'),
"version": request.POST.get('version', '0.0.0'), "version": request.POST.get('version', '0.0.0'),
"banner": request.POST.get('banner'), "banner": request.POST.get('banner', ''),
"description": request.POST.get('description'), "description": request.POST.get('description',''),
"titles": json.loads(request.POST.get('titles', '[]')) "titles": json.loads(request.POST.get('titles', '[]'))
} }
......
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