From 5cb6dc9fc6ff517fdf11afc49838ac69ddccb568 Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Mon, 10 Feb 2020 14:00:31 +0300 Subject: [PATCH] establishment status elastic --- apps/search_indexes/views.py | 3 ++- project/settings/amazon_s3.py | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/search_indexes/views.py b/apps/search_indexes/views.py index 9ffa4161..2613cf3d 100644 --- a/apps/search_indexes/views.py +++ b/apps/search_indexes/views.py @@ -5,6 +5,7 @@ from django_elasticsearch_dsl_drf.filter_backends import ( GeoSpatialOrderingFilterBackend, OrderingFilterBackend, ) +from establishment.models import Establishment from django_elasticsearch_dsl_drf.viewsets import BaseDocumentViewSet from elasticsearch_dsl import TermsFacet from rest_framework import permissions @@ -124,7 +125,7 @@ class EstablishmentDocumentViewSet(BaseDocumentViewSet): def get_queryset(self): qs = super(EstablishmentDocumentViewSet, self).get_queryset() - qs = qs.filter('match', is_publish=True) + qs = qs.filter('match', status=Establishment.PUBLISHED) return qs filter_backends = [ diff --git a/project/settings/amazon_s3.py b/project/settings/amazon_s3.py index b602618d..1c9c05d3 100644 --- a/project/settings/amazon_s3.py +++ b/project/settings/amazon_s3.py @@ -20,3 +20,4 @@ STATICFILES_STORAGE = 'project.storage_backends.PublicStaticStorage' # Public media settings MEDIA_URL = f'https://{AWS_S3_CUSTOM_DOMAIN}/{MEDIA_LOCATION}/' DEFAULT_FILE_STORAGE = 'project.storage_backends.PublicMediaStorage' +AWS_DEFAULT_ACL = 'public-read'