Merge remote-tracking branch 'origin/develop' into develop

apps/news/serializers.py

@@ -129,11 +129,8 @@ class NewsTypeSerializer(serializers.ModelSerializer):
 class NewsBaseSerializer(ProjectModelSerializer):
     """Base serializer for News model."""
 
-    # read only fields
     title_translated = TranslatedField()
     subtitle_translated = TranslatedField()
-
-    # related fields
     news_type = NewsTypeSerializer(read_only=True)
     tags = TagBaseSerializer(read_only=True, many=True)
 
@@ -155,27 +152,12 @@ class NewsBaseSerializer(ProjectModelSerializer):
 class NewsListSerializer(NewsBaseSerializer):
     """List serializer for News model."""
 
-    # read only fields
-    title_translated = TranslatedField()
-    subtitle_translated = TranslatedField()
-
-    # related fields
-    news_type = NewsTypeSerializer(read_only=True)
-    tags = TagBaseSerializer(read_only=True, many=True)
     image = NewsImageSerializer(source='main_image', allow_null=True)
 
-    class Meta:
+    class Meta(NewsBaseSerializer.Meta):
         """Meta class."""
 
-        model = models.News
-        fields = (
-            'id',
-            'title_translated',
-            'subtitle_translated',
-            'is_highlighted',
-            'news_type',
-            'tags',
-            'slug',
+        fields = NewsBaseSerializer.Meta.fields + (
             'image',
         )
 
@@ -266,8 +248,10 @@ class NewsBackOfficeDetailSerializer(NewsBackOfficeBaseSerializer,
 
 class NewsBackOfficeGallerySerializer(serializers.ModelSerializer):
     """Serializer class for model NewsGallery."""
+
     class Meta:
         """Meta class"""
+
         model = models.NewsGallery
         fields = [
             'id',

apps/news/views.py

@@ -1,6 +1,4 @@
 """News app views."""
-from django.shortcuts import get_object_or_404
-from rest_framework import generics, permissions
 from django.conf import settings
 from django.db.transaction import on_commit
 from django.shortcuts import get_object_or_404
@@ -17,7 +15,6 @@ class NewsMixinView:
     """News mixin."""
 
     permission_classes = (permissions.AllowAny, )
-    serializer_class = serializers.NewsBaseSerializer
 
     def get_queryset(self, *args, **kwargs):
         """Override get_queryset method."""
@@ -30,6 +27,7 @@ class NewsMixinView:
 
 class NewsListView(NewsMixinView, generics.ListAPIView):
     """News list view."""
+
     serializer_class = serializers.NewsListSerializer
     filter_class = filters.NewsListFilterSet