From a3f3ae764eddaf0795e2b3e96a2d51922aaea2e8 Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Thu, 8 Feb 2018 11:55:04 +0300 Subject: [PATCH 1/3] Clean not needed serializers --- api/v1/serializers.py | 18 ------------------ api/v1/views.py | 5 ++--- 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/api/v1/serializers.py b/api/v1/serializers.py index f0955f50..8b1eb42d 100644 --- a/api/v1/serializers.py +++ b/api/v1/serializers.py @@ -322,25 +322,7 @@ class UserSerializer(serializers.ModelSerializer): ) -class CoverImageSerializer(serializers.Serializer): - cover = Base64ImageField( - required=False, allow_empty_file=True, allow_null=True - ) - - class UserPhotoSerializer(serializers.Serializer): photo = Base64ImageField( required=False, allow_empty_file=True, allow_null=True ) - - -class ContentImageSerializer(serializers.Serializer): - img = Base64ImageField( - required=False, allow_empty_file=True, allow_null=True - ) - - -class GalleryImageSerializer(serializers.Serializer): - image = Base64ImageField( - required=False, allow_empty_file=True, allow_null=True - ) diff --git a/api/v1/views.py b/api/v1/views.py index 651f1024..f6eed8b1 100644 --- a/api/v1/views.py +++ b/api/v1/views.py @@ -13,9 +13,8 @@ from .serializers import ( ImageTextSerializer, VideoSerializer, GallerySerializer, GalleryImageSerializer, UserSerializer, UserPhotoSerializer, - LessonSerializer, ContentImageSerializer, - GalleryImageSerializer, CoverImageSerializer, - CourseRetrieveSerializer, ImageObjectSerializer, + LessonSerializer, CourseRetrieveSerializer, + ImageObjectSerializer, ) from .permissions import IsAdmin, IsAdminOrIsSelf, IsAuthorOrAdmin, IsAuthorObjectOrAdmin From 1e2fa484343747300006bcf53a3955349c05b221 Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Thu, 8 Feb 2018 13:07:56 +0300 Subject: [PATCH 2/3] Fix price field help text --- apps/course/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/course/models.py b/apps/course/models.py index 6ad7866f..a00250fe 100644 --- a/apps/course/models.py +++ b/apps/course/models.py @@ -38,7 +38,7 @@ class Course(models.Model): null=True, blank=True, ) price = models.DecimalField( - 'Цена курса', help_text='Если цены нету, то курс бесплатный', + 'Цена курса', help_text='Если цена не выставлена, то курс бесплатный', max_digits=10, decimal_places=2, null=True, blank=True ) is_infinite = models.BooleanField(default=False) From c843c0f3539335b74726794b611b6931c88c8e25 Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Thu, 8 Feb 2018 13:08:29 +0300 Subject: [PATCH 3/3] Update GalleryImage serializers and viewset --- api/v1/serializers.py | 7 +++++-- api/v1/views.py | 8 ++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/api/v1/serializers.py b/api/v1/serializers.py index 8b1eb42d..4b26877e 100644 --- a/api/v1/serializers.py +++ b/api/v1/serializers.py @@ -51,8 +51,7 @@ class GallerySerializer(serializers.ModelSerializer): ) -class GalleryImageSerializer(serializers.ModelSerializer): - img = ImageObjectSerializer() +class GalleryImageCreateSerializer(serializers.ModelSerializer): class Meta: model = GalleryImage @@ -71,6 +70,10 @@ class GalleryImageSerializer(serializers.ModelSerializer): ) +class GalleryImageSerializer(GalleryImageCreateSerializer): + img = ImageObjectSerializer() + + class MaterialSerializer(serializers.ModelSerializer): class Meta: diff --git a/api/v1/views.py b/api/v1/views.py index f6eed8b1..af0b0e4a 100644 --- a/api/v1/views.py +++ b/api/v1/views.py @@ -11,7 +11,7 @@ from .serializers import ( MaterialSerializer, LikeSerializer, ImageSerializer, TextSerializer, ImageTextSerializer, VideoSerializer, - GallerySerializer, GalleryImageSerializer, + GallerySerializer, GalleryImageSerializer, GalleryImageCreateSerializer, UserSerializer, UserPhotoSerializer, LessonSerializer, CourseRetrieveSerializer, ImageObjectSerializer, @@ -160,8 +160,12 @@ class GalleryImageViewSet(ExtendedModelViewSet): queryset = GalleryImage.objects.select_related( 'gallery', 'img', ).all() - serializer_class = GalleryImageSerializer + serializer_class = GalleryImageCreateSerializer search_fields = ('gallery__title',) + serializer_class_map = { + 'list': GalleryImageSerializer, + 'retrieve': GalleryImageSerializer, + } # permission_classes = (IsAuthorOrAdmin,) # permission_map = { # 'delete': IsAdmin,