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

Merge remote-tracking branch 'origin/develop' into maigrate-carousel

Browse Source
This commit is contained in:
alex 2019-10-31 17:56:15 +03:00
commit f237c37840
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/main/models.py
View File

@ -172,8 +172,9 @@ class SiteSettings(ProjectBaseMixin):
@property @property
def published_sitefeatures(self): def published_sitefeatures(self):
return self.sitefeature_set\ return self.sitefeature_set. \
.filter(Q(published=True) and Q(feature__source__in=[PlatformMixin.WEB, PlatformMixin.ALL])) filter(Q(published=True) &
Q(feature__source__in=[PlatformMixin.WEB, PlatformMixin.ALL]))
@property @property
def site_url(self): def site_url(self):

2
apps/search_indexes/documents/establishment.py
View File

@ -37,7 +37,7 @@ class EstablishmentDocument(Document):
works_noon = fields.ListField(fields.IntegerField( works_noon = fields.ListField(fields.IntegerField(
attr='works_noon' attr='works_noon'
)) ))
# works_now = fields.BooleanField(attr='works_now') works_now = fields.BooleanField(attr='works_now')
tags = fields.ObjectField( tags = fields.ObjectField(
properties={ properties={
'id': fields.IntegerField(attr='id'), 'id': fields.IntegerField(attr='id'),

14
apps/search_indexes/views.py
View File

@ -139,7 +139,7 @@ class EstablishmentDocumentViewSet(BaseDocumentViewSet):
'lookups': [ 'lookups': [
constants.LOOKUP_QUERY_IN, constants.LOOKUP_QUERY_IN,
], ],
}, },
'works_noon': { 'works_noon': {
'field': 'works_noon', 'field': 'works_noon',
'lookups': [ 'lookups': [
@ -152,12 +152,12 @@ class EstablishmentDocumentViewSet(BaseDocumentViewSet):
constants.LOOKUP_QUERY_IN, constants.LOOKUP_QUERY_IN,
], ],
}, },
# 'works_now': { 'works_now': {
# 'field': 'works_now', 'field': 'works_now',
# 'lookups': [ 'lookups': [
# constants.LOOKUP_FILTER_TERM, constants.LOOKUP_FILTER_TERM,
# ] ]
# }, },
} }
geo_spatial_filter_fields = { geo_spatial_filter_fields = {

4
apps/tag/serializers.py
View File

@ -14,7 +14,7 @@ class TagBaseSerializer(serializers.ModelSerializer):
# todo: refactor this # todo: refactor this
# label_translated = TranslatedField() # label_translated = TranslatedField()
label_translated = serializers.CharField(source='value') label_translated = serializers.CharField(source='value', read_only=True, allow_null=True)
class Meta: class Meta:
"""Meta class.""" """Meta class."""
@ -43,7 +43,7 @@ class TagCategoryBaseSerializer(serializers.ModelSerializer):
# todo: refactor this # todo: refactor this
# label_translated = TranslatedField() # label_translated = TranslatedField()
label_translated = serializers.CharField(source='index_name') label_translated = serializers.CharField(source='index_name', read_only=True, allow_null=True)
tags = TagBaseSerializer(many=True, read_only=True) tags = TagBaseSerializer(many=True, read_only=True)
class Meta: class Meta:

5
apps/transfer/serializers/establishment.py
View File

@ -6,8 +6,8 @@ from establishment.models import Establishment, ContactEmail, ContactPhone, Esta
from location.models import Address from location.models import Address
from timetable.models import Timetable from timetable.models import Timetable
from utils.legacy_parser import parse_legacy_schedule_content from utils.legacy_parser import parse_legacy_schedule_content
from utils.serializers import TimeZoneChoiceField
from utils.slug_generator import generate_unique_slug from utils.slug_generator import generate_unique_slug
from pytz import timezone as ptz
class EstablishmentSerializer(serializers.ModelSerializer): class EstablishmentSerializer(serializers.ModelSerializer):
@ -26,7 +26,7 @@ class EstablishmentSerializer(serializers.ModelSerializer):
twitter = serializers.CharField(allow_null=True, allow_blank=True) twitter = serializers.CharField(allow_null=True, allow_blank=True)
booking = serializers.CharField(allow_null=True, allow_blank=True) booking = serializers.CharField(allow_null=True, allow_blank=True)
state = serializers.CharField(allow_null=True) state = serializers.CharField(allow_null=True)
tz = serializers.CharField() tz = TimeZoneChoiceField()
created = serializers.DateTimeField(format='%m-%d-%Y %H:%M:%S') created = serializers.DateTimeField(format='%m-%d-%Y %H:%M:%S')
class Meta: class Meta:
@ -59,7 +59,6 @@ class EstablishmentSerializer(serializers.ModelSerializer):
'establishment_type_id': self.get_type(data), 'establishment_type_id': self.get_type(data),
'is_publish': data.get('state') == 'published', 'is_publish': data.get('state') == 'published',
}) })
data['tz'] = ptz(data['tz'])
data.pop('location') data.pop('location')
data.pop('type') data.pop('type')
data.pop('state') data.pop('state')