From ac0b28a06c9158a0e595ae16643a2514dc78087b Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Mon, 15 Apr 2019 22:39:28 +1000
Subject: [PATCH] Simplify part filtering
---
InvenTree/part/api.py | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/InvenTree/part/api.py b/InvenTree/part/api.py
index 024d61a4a5..61e91bc2e1 100644
--- a/InvenTree/part/api.py
+++ b/InvenTree/part/api.py
@@ -70,13 +70,14 @@ class PartList(generics.ListCreateAPIView):
serializer_class = PartSerializer
def get_queryset(self):
- print("Get queryset")
# Does the user wish to filter by category?
cat_id = self.request.query_params.get('category', None)
+ # Start with all objects
+ parts_list = Part.objects.all()
+
if cat_id:
- print("Getting category:", cat_id)
category = get_object_or_404(PartCategory, pk=cat_id)
# Filter by the supplied category
@@ -90,10 +91,10 @@ class PartList(generics.ListCreateAPIView):
continue
flt |= Q(category=child)
- return Part.objects.filter(flt)
+ parts_list = parts_list.filter(flt)
# Default - return all parts
- return Part.objects.all()
+ return parts_list
permission_classes = [
permissions.IsAuthenticatedOrReadOnly,