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

fixed EstablishmentFilter

Browse Source
This commit is contained in:
Anatoly 2019-10-22 15:58:00 +03:00
parent 4c9ea2e0e7
commit 071b634659
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apps/establishment/filters.py
View File

@ -1,6 +1,7 @@
"""Establishment app filters.""" """Establishment app filters."""
from django.core.validators import EMPTY_VALUES from django.core.validators import EMPTY_VALUES
from django_filters import rest_framework as filters from django_filters import rest_framework as filters
from establishment import models from establishment import models
@ -10,9 +11,9 @@ class EstablishmentFilter(filters.FilterSet):
tag_id = filters.NumberFilter(field_name='tags__metadata__id',) tag_id = filters.NumberFilter(field_name='tags__metadata__id',)
award_id = filters.NumberFilter(field_name='awards__id',) award_id = filters.NumberFilter(field_name='awards__id',)
search = filters.CharFilter(method='search_text') search = filters.CharFilter(method='search_text')
est_type = filters.ChoiceFilter(choices=models.EstablishmentType.INDEX_NAME_TYPES, type = filters.ChoiceFilter(choices=models.EstablishmentType.INDEX_NAME_TYPES,
method='by_type') method='by_type')
est_subtype = filters.ChoiceFilter(choices=models.EstablishmentSubType.INDEX_NAME_TYPES, subtype = filters.ChoiceFilter(choices=models.EstablishmentSubType.INDEX_NAME_TYPES,
method='by_subtype') method='by_subtype')
class Meta: class Meta:
@ -23,8 +24,8 @@ class EstablishmentFilter(filters.FilterSet):
'tag_id', 'tag_id',
'award_id', 'award_id',
'search', 'search',
'est_type', 'type',
'est_subtype', 'subtype',
) )
def search_text(self, queryset, name, value): def search_text(self, queryset, name, value):
@ -34,10 +35,14 @@ class EstablishmentFilter(filters.FilterSet):
return queryset return queryset
def by_type(self, queryset, name, value): def by_type(self, queryset, name, value):
if value not in EMPTY_VALUES:
return queryset.by_type(value) return queryset.by_type(value)
return queryset
def by_subtype(self, queryset, name, value): def by_subtype(self, queryset, name, value):
if value not in EMPTY_VALUES:
return queryset.by_subtype(value) return queryset.by_subtype(value)
return queryset
class EstablishmentTypeTagFilter(filters.FilterSet): class EstablishmentTypeTagFilter(filters.FilterSet):