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

Remove name_translated from establishment. Added AddressDetailSerializer

Browse Source 
to EstablishmentRUDView
This commit is contained in:
evgeniy-st 2019-11-06 14:16:10 +03:00
parent edaf9f8fdb
commit c17f9ce820
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/establishment/serializers/back.py
View File

@ -5,6 +5,7 @@ from establishment.serializers import (
EstablishmentBaseSerializer, PlateSerializer, ContactEmailsSerializer, EstablishmentBaseSerializer, PlateSerializer, ContactEmailsSerializer,
ContactPhonesSerializer, SocialNetworkRelatedSerializers, ContactPhonesSerializer, SocialNetworkRelatedSerializers,
EstablishmentTypeBaseSerializer) EstablishmentTypeBaseSerializer)
from location.serializers import AddressDetailSerializer
from main.models import Currency from main.models import Currency
from utils.decorators import with_base_attributes from utils.decorators import with_base_attributes
from utils.serializers import TimeZoneChoiceField from utils.serializers import TimeZoneChoiceField
@ -55,6 +56,7 @@ class EstablishmentRUDSerializer(EstablishmentBaseSerializer):
source='establishment_type', source='establishment_type',
queryset=models.EstablishmentType.objects.all(), write_only=True queryset=models.EstablishmentType.objects.all(), write_only=True
) )
address = AddressDetailSerializer()
phones = ContactPhonesSerializer(read_only=False, many=True, ) phones = ContactPhonesSerializer(read_only=False, many=True, )
emails = ContactEmailsSerializer(read_only=False, many=True, ) emails = ContactEmailsSerializer(read_only=False, many=True, )
socials = SocialNetworkRelatedSerializers(read_only=False, many=True, ) socials = SocialNetworkRelatedSerializers(read_only=False, many=True, )

4
apps/establishment/serializers/common.py
View File

@ -189,9 +189,6 @@ class EstablishmentBaseSerializer(ProjectModelSerializer):
tags = TagBaseSerializer(read_only=True, many=True) tags = TagBaseSerializer(read_only=True, many=True)
currency = CurrencySerializer() currency = CurrencySerializer()
# todo: remove field (backward compatibility)
name_translated = serializers.CharField(source='transliterated_name')
class Meta: class Meta:
"""Meta class.""" """Meta class."""
@ -201,7 +198,6 @@ class EstablishmentBaseSerializer(ProjectModelSerializer):
'name', 'name',
'transliterated_name', 'transliterated_name',
'index_name', 'index_name',
'name_translated',
'price_level', 'price_level',
'toque_number', 'toque_number',
'public_mark', 'public_mark',

4
apps/search_indexes/serializers.py
View File

@ -89,9 +89,6 @@ class EstablishmentDocumentSerializer(DocumentSerializer):
tags = TagsDocumentSerializer(many=True) tags = TagsDocumentSerializer(many=True)
schedule = ScheduleDocumentSerializer(many=True, allow_null=True) schedule = ScheduleDocumentSerializer(many=True, allow_null=True)
# todo: remove field (backward compatibility)
name_translated = serializers.CharField(source='transliterated_name')
class Meta: class Meta:
"""Meta class.""" """Meta class."""
@ -101,7 +98,6 @@ class EstablishmentDocumentSerializer(DocumentSerializer):
'name', 'name',
'transliterated_name', 'transliterated_name',
'index_name', 'index_name',
'name_translated',
'price_level', 'price_level',
'toque_number', 'toque_number',
'public_mark', 'public_mark',