|
@@ -89,13 +89,13 @@ class BaseFilterSet(django_filters.FilterSet):
|
|
|
filters.MultiValueNumberFilter,
|
|
filters.MultiValueNumberFilter,
|
|
|
filters.MultiValueTimeFilter
|
|
filters.MultiValueTimeFilter
|
|
|
)):
|
|
)):
|
|
|
- lookup_map = FILTER_NUMERIC_BASED_LOOKUP_MAP
|
|
|
|
|
|
|
+ return FILTER_NUMERIC_BASED_LOOKUP_MAP
|
|
|
|
|
|
|
|
elif isinstance(existing_filter, (
|
|
elif isinstance(existing_filter, (
|
|
|
filters.TreeNodeMultipleChoiceFilter,
|
|
filters.TreeNodeMultipleChoiceFilter,
|
|
|
)):
|
|
)):
|
|
|
# TreeNodeMultipleChoiceFilter only support negation but must maintain the `in` lookup expression
|
|
# TreeNodeMultipleChoiceFilter only support negation but must maintain the `in` lookup expression
|
|
|
- lookup_map = FILTER_TREENODE_NEGATION_LOOKUP_MAP
|
|
|
|
|
|
|
+ return FILTER_TREENODE_NEGATION_LOOKUP_MAP
|
|
|
|
|
|
|
|
elif isinstance(existing_filter, (
|
|
elif isinstance(existing_filter, (
|
|
|
django_filters.ModelChoiceFilter,
|
|
django_filters.ModelChoiceFilter,
|
|
@@ -103,7 +103,7 @@ class BaseFilterSet(django_filters.FilterSet):
|
|
|
TagFilter
|
|
TagFilter
|
|
|
)) or existing_filter.extra.get('choices'):
|
|
)) or existing_filter.extra.get('choices'):
|
|
|
# These filter types support only negation
|
|
# These filter types support only negation
|
|
|
- lookup_map = FILTER_NEGATION_LOOKUP_MAP
|
|
|
|
|
|
|
+ return FILTER_NEGATION_LOOKUP_MAP
|
|
|
|
|
|
|
|
elif isinstance(existing_filter, (
|
|
elif isinstance(existing_filter, (
|
|
|
django_filters.filters.CharFilter,
|
|
django_filters.filters.CharFilter,
|
|
@@ -111,12 +111,9 @@ class BaseFilterSet(django_filters.FilterSet):
|
|
|
filters.MultiValueCharFilter,
|
|
filters.MultiValueCharFilter,
|
|
|
filters.MultiValueMACAddressFilter
|
|
filters.MultiValueMACAddressFilter
|
|
|
)):
|
|
)):
|
|
|
- lookup_map = FILTER_CHAR_BASED_LOOKUP_MAP
|
|
|
|
|
|
|
+ return FILTER_CHAR_BASED_LOOKUP_MAP
|
|
|
|
|
|
|
|
- else:
|
|
|
|
|
- lookup_map = None
|
|
|
|
|
-
|
|
|
|
|
- return lookup_map
|
|
|
|
|
|
|
+ return None
|
|
|
|
|
|
|
|
@classmethod
|
|
@classmethod
|
|
|
def get_filters(cls):
|
|
def get_filters(cls):
|