From c5e9048d377b49d2fedb29fd850c401806d2d693 Mon Sep 17 00:00:00 2001 From: DavidVadnais Date: Tue, 21 Jan 2025 20:56:08 +0000 Subject: [PATCH] removing filtering_or pending clarification --- helpdesk/query.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/helpdesk/query.py b/helpdesk/query.py index 9ae9e400..ba51584b 100644 --- a/helpdesk/query.py +++ b/helpdesk/query.py @@ -105,9 +105,15 @@ class __Query__: sorting: The name of the column to sort by """ filter = self.params.get('filtering', {}) - filter_or = self.params.get('filtering_or', {}) - queryset = queryset.filter( - (Q(**filter) | Q(**filter_or)) & self.get_search_filter_args()) + filter_or = self.params.get('filtering_or') + + query_filter = Q(**filter) + + if 'filtering_or' in self.params: + print(self.params) + #query_filter |= Q(**filter_or) + + queryset = queryset.filter(query_filter & self.get_search_filter_args()) sorting = self.params.get('sorting', None) if sorting: sortreverse = self.params.get('sortreverse', None)