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

Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop

Browse Source
This commit is contained in:
Виктор Гладких 2019-11-13 12:23:21 +03:00
commit 2cf845eedb
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/product/serializers/common.py
View File

@ -76,6 +76,9 @@ class ProductBaseSerializer(serializers.ModelSerializer):
subtypes = ProductSubTypeBaseSerializer(many=True, read_only=True) subtypes = ProductSubTypeBaseSerializer(many=True, read_only=True)
establishment_detail = EstablishmentShortSerializer(source='establishment', read_only=True) establishment_detail = EstablishmentShortSerializer(source='establishment', read_only=True)
tags = TagBaseSerializer(source='related_tags', many=True, read_only=True) tags = TagBaseSerializer(source='related_tags', many=True, read_only=True)
wine_region = WineRegionBaseSerializer(read_only=True)
wine_colors = TagBaseSerializer(many=True, read_only=True)
preview_image_url = serializers.URLField(source='preview_main_image_url', preview_image_url = serializers.URLField(source='preview_main_image_url',
allow_null=True, allow_null=True,
read_only=True) read_only=True)
@ -94,6 +97,8 @@ class ProductBaseSerializer(serializers.ModelSerializer):
'vintage', 'vintage',
'tags', 'tags',
'preview_image_url', 'preview_image_url',
'wine_region',
'wine_colors',
] ]
@ -104,9 +109,7 @@ class ProductDetailSerializer(ProductBaseSerializer):
awards = AwardSerializer(many=True, read_only=True) awards = AwardSerializer(many=True, read_only=True)
classifications = ProductClassificationBaseSerializer(many=True, read_only=True) classifications = ProductClassificationBaseSerializer(many=True, read_only=True)
standards = ProductStandardBaseSerializer(many=True, read_only=True) standards = ProductStandardBaseSerializer(many=True, read_only=True)
wine_region = WineRegionBaseSerializer(read_only=True)
wine_sub_region = WineSubRegionBaseSerializer(read_only=True) wine_sub_region = WineSubRegionBaseSerializer(read_only=True)
wine_colors = TagBaseSerializer(many=True, read_only=True)
bottles_produced = TagBaseSerializer(many=True, read_only=True) bottles_produced = TagBaseSerializer(many=True, read_only=True)
sugar_contents = TagBaseSerializer(many=True, read_only=True) sugar_contents = TagBaseSerializer(many=True, read_only=True)
image_url = serializers.ImageField(source='main_image_url', image_url = serializers.ImageField(source='main_image_url',
@ -120,9 +123,7 @@ class ProductDetailSerializer(ProductBaseSerializer):
'awards', 'awards',
'classifications', 'classifications',
'standards', 'standards',
'wine_region',
'wine_sub_region', 'wine_sub_region',
'wine_colors',
'bottles_produced', 'bottles_produced',
'sugar_contents', 'sugar_contents',
'image_url', 'image_url',