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

fix plate_set

Browse Source
This commit is contained in:
alex 2020-01-24 13:31:00 +03:00
parent 3f3848e317
commit 34055d3669
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/establishment/models.py
View File

@ -142,8 +142,8 @@ class EstablishmentQuerySet(models.QuerySet):
def with_extended_related(self):
return self.with_extended_address_related().select_related('establishment_type'). \
prefetch_related('establishment_subtypes', 'awards', 'schedule',
'phones', 'gallery', 'menu_set', 'menu_set__plate_set',
'menu_set__plate_set__currency', 'currency'). \
'phones', 'gallery', 'menu_set', 'menu_set__plates',
'menu_set__plates__currency', 'currency'). \
prefetch_actual_employees()
def with_type_related(self):

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

@ -531,7 +531,7 @@ class MenuDishesSerializer(ProjectModelSerializer):
"""for dessert, main_course and starter category"""
schedule = ScheduleRUDSerializer(many=True, allow_null=True)
plates = _PlateSerializer(read_only=True, many=True, source='plate_set')
plates = _PlateSerializer(read_only=True, many=True, source='plate_set', allow_null=True)
category_translated = serializers.CharField(read_only=True)
last_update = serializers.DateTimeField(source='created')
@ -552,7 +552,8 @@ class MenuDishesSerializer(ProjectModelSerializer):
class MenuDishesRUDSerializers(ProjectModelSerializer):
"""for dessert, main_course and starter category"""
plates = _PlateSerializer(read_only=True, many=True, source='plate_set')
plates = _PlateSerializer(read_only=True, many=True, source='plate_set', allow_null=True)
schedule = ScheduleRUDSerializer(read_only=True, many=True, allow_null=True)
class Meta:
model = models.Menu
@ -562,4 +563,5 @@ class MenuDishesRUDSerializers(ProjectModelSerializer):
'plates',
'establishment',
'is_drinks_included',
'schedule',
]