Skip to content

Commit

Permalink
fix(filters): restore custom search fields
Browse files Browse the repository at this point in the history
Rename custom search fields so they don't
clash/aren't overwritten by new APIS Core
search field which filters across a model's
(built-in) string fields (CharField, TextField).
  • Loading branch information
koeaw committed Aug 19, 2024
1 parent 110fab8 commit 41adb9c
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions apis_ontology/filtersets.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,16 +109,16 @@ class BaseEntityFilterSet(AbstractEntityFilterSet):
"""
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
if "search" in self.filters:
self.filters.move_to_end("search", False)
if "custom_search" in self.filters:
self.filters.move_to_end("custom_search", False)


class TitlesSearch(django_filters.FilterSet):
"""
Search within title and subtitle fields.
"""

search = django_filters.CharFilter(
custom_search = django_filters.CharFilter(
field_name=[
"title",
"subtitle",
Expand All @@ -138,7 +138,7 @@ class AlternativeNameSearch(django_filters.FilterSet):
i.e. an entity cannot have an "alternative_name" without a "name".
"""

search = django_filters.CharFilter(
custom_search = django_filters.CharFilter(
field_name=[
"name",
"alternative_name",
Expand All @@ -155,7 +155,7 @@ class PersonSearch(django_filters.FilterSet):
entities (like characters).
"""

search = django_filters.CharFilter(
custom_search = django_filters.CharFilter(
field_name=[
"surname",
"forename",
Expand Down Expand Up @@ -200,7 +200,7 @@ class VersionCharacterFilterSet(CharacterFilterSet):


class WorkFilterSet(BaseEntityFilterSet, TitlesSearch):
search = django_filters.CharFilter(
custom_search = django_filters.CharFilter(
field_name=[
"title",
"subtitle",
Expand Down Expand Up @@ -327,7 +327,7 @@ class TopicFilterSet(BaseEntityFilterSet, AlternativeNameSearch):


class WorkTypeFilterSet(BaseEntityFilterSet, AlternativeNameSearch):
search = django_filters.CharFilter(
custom_search = django_filters.CharFilter(
field_name=[
"name",
"name_plural",
Expand Down

0 comments on commit 41adb9c

Please sign in to comment.