fix
This commit is contained in:
@@ -1,3 +1,5 @@
|
|||||||
|
from django.db.models import Q
|
||||||
|
|
||||||
import django_filters
|
import django_filters
|
||||||
|
|
||||||
from core.apps.orders.models.order import Order
|
from core.apps.orders.models.order import Order
|
||||||
@@ -24,4 +26,16 @@ class OrderFilter(django_filters.FilterSet):
|
|||||||
fields = [
|
fields = [
|
||||||
'wherehouse', 'project', 'project_folder', 'date',
|
'wherehouse', 'project', 'project_folder', 'date',
|
||||||
]
|
]
|
||||||
|
|
||||||
|
def filter_queryset(self, queryset):
|
||||||
|
queryset = super().filter_queryset(queryset)
|
||||||
|
|
||||||
|
project_ids = self.data.getlist('project')
|
||||||
|
folder_ids = self.data.getlist('project_folder')
|
||||||
|
|
||||||
|
if project_ids and folder_ids:
|
||||||
|
queryset = queryset.filter(
|
||||||
|
Q(project__in=project_ids) | Q(project_folder__in=folder_ids)
|
||||||
|
)
|
||||||
|
|
||||||
|
return queryset
|
||||||
Reference in New Issue
Block a user