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

must of the week mark

Browse Source
This commit is contained in:
a.gorbunov 2020-02-07 10:40:30 +00:00
parent 0eb6a73e09
commit 5b6db0f974
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -255,6 +255,7 @@ class EstablishmentRUDSerializer(model_serializers.EstablishmentBaseSerializer):
'status', 'status',
'status_display', 'status_display',
'last_review', 'last_review',
'must_of_the_week',
] ]
def to_representation(self, instance): def to_representation(self, instance):

10
apps/utils/models.py
View File

@ -518,6 +518,7 @@ def default_menu_bool_array():
class PhoneModelMixin: class PhoneModelMixin:
"""Mixin for PhoneNumberField.""" """Mixin for PhoneNumberField."""
@cached_property @cached_property
def country_calling_code(self): def country_calling_code(self):
"""Return phone code from PhonеNumberField.""" """Return phone code from PhonеNumberField."""
@ -546,10 +547,13 @@ class CarouselMixin:
"""Detects whether current item in carousel""" """Detects whether current item in carousel"""
from main.models import Carousel from main.models import Carousel
if hasattr(self, 'pk') and hasattr(self, 'country'): if hasattr(self, 'pk') and (hasattr(self, 'country') or hasattr(self, 'country_id')):
kwargs = { kwargs = {
'content_type': ContentType.objects.get_for_model(self), 'content_type': ContentType.objects.get_for_model(self),
'object_id': self.pk, 'object_id': self.pk,
'country': self.country, 'country': getattr(self, 'country', getattr(self, 'country_id', None)),
} }
return Carousel.objects.filter(**kwargs).exists()
return Carousel.objects.filter(**kwargs).exists()
return False