Merge branch 'comment_fix' into 'dev'

Выставляется препод к курсу

See merge request !472
remotes/origin/HEAD
Andrey 8 years ago
commit f4df15e6a0
  1. 1
      storage/urls.py
  2. 30
      storage/views.py

@ -3,5 +3,6 @@ from storage import views
urlpatterns = [ urlpatterns = [
url(r'files/$', views.FileView.as_view()), url(r'files/$', views.FileView.as_view()),
url(r'comment/create/$', views.CreateCommentView.as_view()),
url(r'comments/$', views.CommentView.as_view()), url(r'comments/$', views.CommentView.as_view()),
] ]

@ -35,19 +35,7 @@ class CommentView(APIView):
@staticmethod @staticmethod
def post(request): def post(request):
text = request.JSON.get('text', None) base64_tokens = request.JSON.get('base64_tokens', None)
user_key = request.JSON.get('user_token', None)
files = request.JSON.get('files', [])
if user_key:
comment = add_comment(text=text, out_key=user_key, files=files)
return Response(CommentSerializer(comment).data, status=200)
return Response("user_token mast be set", status=400)
@staticmethod
def get(request):
base64_tokens = request.GET.get('base64_tokens', None)
if not base64_tokens: if not base64_tokens:
return Response("Attribute token not set", status=400) return Response("Attribute token not set", status=400)
@ -63,3 +51,19 @@ class CommentView(APIView):
pass pass
return Response([CommentSerializer(comment).data for comment in comments], status=200) return Response([CommentSerializer(comment).data for comment in comments], status=200)
class CreateCommentView(APIView):
renderer_classes = (JSONRenderer,)
@staticmethod
def post(request):
text = request.JSON.get('text', None)
user_key = request.JSON.get('user_token', None)
files = request.JSON.get('files', [])
if user_key:
comment = add_comment(text=text, out_key=user_key, files=files)
return Response(CommentSerializer(comment).data, status=200)
return Response("user_token mast be set", status=400)

Loading…
Cancel
Save