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

Merge branch 'feature/reviews' into develop

Browse Source 
# Conflicts:
#	apps/establishment/admin.py
#	apps/establishment/models.py
#	apps/establishment/serializers.py
This commit is contained in:
Anatoly 2019-09-01 14:09:37 +03:00
parent cd0f03f05d
commit 1494bbbf36
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/establishment/serializers.py
View File

@ -1,5 +1,6 @@
"""Establishment serializers.""" """Establishment serializers."""
from rest_framework import serializers from rest_framework import serializers
from establishment import models from establishment import models
from location.serializers import AddressSerializer from location.serializers import AddressSerializer
from main.serializers import MetaDataContentSerializer, AwardSerializer from main.serializers import MetaDataContentSerializer, AwardSerializer
@ -113,6 +114,6 @@ class EstablishmentSerializer(serializers.ModelSerializer):
'awards', 'awards',
'schedule', 'schedule',
'phones', 'phones',
'emails' 'emails',
'reviews', 'reviews',
) )