From 7c5ba16d24119d27406d6a4708bf64c595f4ea63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?He=CC=81ctor=20Ferna=CC=81ndez=20Cascallar?= Date: Fri, 18 Jan 2019 13:57:13 +0100 Subject: [PATCH] refactor prepare filter methods in tags filter --- taiga/base/filters.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/taiga/base/filters.py b/taiga/base/filters.py index aba7834e..437a436e 100644 --- a/taiga/base/filters.py +++ b/taiga/base/filters.py @@ -506,11 +506,11 @@ class TagsFilter(FilterBackend): return None - def prepare_filter(self, query, queryset): - return queryset.filter(tags__contains=query) + def prepare_filter(self, query): + return Q(tags__contains=query) - def prepare_exclude(self, query, queryset): - return queryset.filter(~Q(tags__contains=query)) + def prepare_exclude(self, query): + return ~Q(tags__contains=query) def filter_queryset(self, request, queryset, view): operations = { @@ -518,10 +518,10 @@ class TagsFilter(FilterBackend): "exclude": self.prepare_exclude, } - for mode, qs_method in operations.items(): + for mode, prepare_method in operations.items(): query = self._get_tags_queryparams(request.QUERY_PARAMS, mode=mode) if query: - queryset = qs_method(query, queryset) + queryset = queryset.filter(prepare_method(query)) return super().filter_queryset(request, queryset, view)