Merge branch 'develop' into feature/roles

This commit is contained in:
Виктор Гладких 2019-10-09 10:44:04 +03:00
commit eff7dfc452

View File

@ -6,10 +6,9 @@ from django_elasticsearch_dsl_drf.filter_backends import (
GeoSpatialFilteringFilterBackend GeoSpatialFilteringFilterBackend
) )
from django_elasticsearch_dsl_drf.viewsets import BaseDocumentViewSet from django_elasticsearch_dsl_drf.viewsets import BaseDocumentViewSet
from utils.pagination import ProjectPageNumberPagination
from search_indexes import serializers, filters from search_indexes import serializers, filters
from search_indexes.documents import EstablishmentDocument, NewsDocument from search_indexes.documents import EstablishmentDocument, NewsDocument
from utils.pagination import ProjectPageNumberPagination
class NewsDocumentViewSet(BaseDocumentViewSet): class NewsDocumentViewSet(BaseDocumentViewSet):
@ -27,11 +26,11 @@ class NewsDocumentViewSet(BaseDocumentViewSet):
FilteringFilterBackend, FilteringFilterBackend,
] ]
search_fields = ( search_fields = {
'title', 'title': {'fuzziness': 'auto:3,4'},
'subtitle', 'subtitle': {'fuzziness': 'auto'},
'description', 'description': {'fuzziness': 'auto'},
) }
translated_search_fields = ( translated_search_fields = (
'title', 'title',
'subtitle', 'subtitle',
@ -65,10 +64,11 @@ class EstablishmentDocumentViewSet(BaseDocumentViewSet):
GeoSpatialFilteringFilterBackend, GeoSpatialFilteringFilterBackend,
] ]
search_fields = ( search_fields = {
'name', 'name': {'fuzziness': 'auto:3,4'},
'description', 'name_translated': {'fuzziness': 'auto:3,4'},
) 'description': {'fuzziness': 'auto'},
}
translated_search_fields = ( translated_search_fields = (
'description', 'description',
) )