phzhik/gault-millau
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed collection list and news list endpoints

Browse Source
This commit is contained in:
Anatoly 2019-08-29 11:42:52 +03:00
parent 57066048d6
commit 79edd6c51d
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/collection/serializers/common.py
View File

@ -8,7 +8,7 @@ from location import models as location_models
class CollectionSerializer(serializers.ModelSerializer): class CollectionSerializer(serializers.ModelSerializer):
"""Collection serializer""" """Collection serializer"""
# RESPONSE # RESPONSE
image_url = serializers.SerializerMethodField() image_url = serializers.ImageField(source='image.image')
# COMMON # COMMON
block_size = serializers.JSONField() block_size = serializers.JSONField()
@ -46,10 +46,6 @@ class CollectionSerializer(serializers.ModelSerializer):
'block_size', 'block_size',
] ]
def get_image_url(self, obj):
"""Return absolute image URL"""
return obj.image.get_full_image_url(request=self.context.get('request'))
class CollectionItemSerializer(serializers.ModelSerializer): class CollectionItemSerializer(serializers.ModelSerializer):
"""CollectionItem serializer""" """CollectionItem serializer"""

8
apps/news/serializers/common.py
View File

@ -23,7 +23,7 @@ class NewsSerializer(serializers.ModelSerializer):
title_translated = serializers.CharField(read_only=True, allow_null=True) title_translated = serializers.CharField(read_only=True, allow_null=True)
subtitle_translated = serializers.CharField(read_only=True, allow_null=True) subtitle_translated = serializers.CharField(read_only=True, allow_null=True)
description_translated = serializers.CharField(read_only=True, allow_null=True) description_translated = serializers.CharField(read_only=True, allow_null=True)
image_url = serializers.SerializerMethodField() image_url = serializers.ImageField(source='image.image')
class Meta: class Meta:
model = models.News model = models.News
@ -42,12 +42,6 @@ class NewsSerializer(serializers.ModelSerializer):
'description_translated', 'description_translated',
] ]
def get_image_url(self, obj):
"""Return absolute image URL"""
if obj.image:
return obj.image.get_full_image_url(request=self.context.get('request'))
return None
class NewsCreateUpdateSerializer(NewsSerializer): class NewsCreateUpdateSerializer(NewsSerializer):
"""News update serializer.""" """News update serializer."""