From 5180d7ea3d08e6accdea9a077b518ca940ea36ec Mon Sep 17 00:00:00 2001 From: Andrey Date: Thu, 10 May 2018 17:45:49 +0300 Subject: [PATCH] =?UTF-8?q?=D0=92=D1=8B=D1=81=D1=82=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D1=8F=D0=B5=D1=82=D1=81=D1=8F=20=D0=BF=D1=80=D0=B5=D0=BF=D0=BE?= =?UTF-8?q?=D0=B4=20=D0=BA=20=D0=BA=D1=83=D1=80=D1=81=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- courses/models.py | 9 +++++++++ courses/views.py | 31 ++++++++++++++++++++----------- 2 files changed, 29 insertions(+), 11 deletions(-) diff --git a/courses/models.py b/courses/models.py index 9cdfdf8..251dcf0 100755 --- a/courses/models.py +++ b/courses/models.py @@ -25,6 +25,10 @@ COURSE_DIRECTION = ( ) +def content_file_name(instance, filename): + return '/'.join(['course', instance.topic.course.token, instance.topic.id, instance.token, filename]) + + class Lesson(models.Model): token = models.UUIDField(verbose_name="Токен", default=uuid.uuid4, editable=False) key = models.UUIDField( @@ -33,6 +37,11 @@ class Lesson(models.Model): title = models.CharField(verbose_name='Название', max_length=255) description = models.TextField(verbose_name='Описание', blank=True, null=True) video = models.TextField(verbose_name='Код видео', blank=True, null=True) + materials = ArrayField( + models.FileField(verbose_name="Материал к уроку", upload_to=content_file_name), + verbose_name="Материалы к уроку", + default=get_empty_list, + ) material_tokens = ArrayField( models.UUIDField(verbose_name="Токен материала", editable=False), default=get_empty_list, diff --git a/courses/views.py b/courses/views.py index ee75638..ba75264 100644 --- a/courses/views.py +++ b/courses/views.py @@ -1,7 +1,8 @@ from jwt import DecodeError +from rest_framework.parsers import MultiPartParser from courses.models import Course, Lesson, Topic -from rest_framework.renderers import JSONRenderer +from rest_framework.renderers import JSONRenderer, BrowsableAPIRenderer from rest_framework.response import Response from rest_framework.views import APIView @@ -87,18 +88,26 @@ class DeleteLessonView(APIView): class UpdateLessonView(APIView): - renderer_classes = (JSONRenderer,) + renderer_classes = (JSONRenderer, BrowsableAPIRenderer) + parser_classes = (MultiPartParser,) @staticmethod - def post(request): - lesson_token = request.JSON.get('token', None) - sort = request.JSON.get('sort', None) - topic_id = request.JSON.get('topic', None) - title = request.JSON.get('title', None) - description = request.JSON.get('description', None) - video = request.JSON.get('video', None) - free = request.JSON.get('free', None) - is_hm = request.JSON.get('is_hm', None) + def bool_transformer(val): + if val == 'false': + return False + if val == 'true': + return True + return val + + def post(self, request): + lesson_token = request.POST.get('token', None) + sort = request.POST.get('sort', None) + topic_id = request.POST.get('topic', None) + title = request.POST.get('title', None) + description = request.POST.get('description', None) + video = request.POST.get('video', None) + free = self.bool_transformer(request.POST.get('free', None)) + is_hm = self.bool_transformer(request.POST.get('is_hm', None)) if topic_id is None: return Response("topic не передан", status=400)