c3lf/c3lf-system-3
9
0
Fork 0
Code Issues 67 Pull requests 1 Projects 2 Releases Wiki Activity Actions

stash
All checks were successful
/ test (push) Successful in 51s
Details
/ deploy (push) Successful in 4m56s
Details

Browse source
This commit is contained in:
j3d1 2024-11-29 01:32:54 +01:00
parent b109e5995e
commit fda7b80ca4
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
core/inventory/api_v2.py
View file

@ -26,13 +26,16 @@ class ContainerViewSet(viewsets.ModelViewSet):
class ItemViewSet(viewsets.ModelViewSet): class ItemViewSet(viewsets.ModelViewSet):
serializer_class = ItemSerializer serializer_class = ItemSerializer
def get_queryset(self): def prefetch_queryset(self, queryset):
queryset = Item.objects.all()
serializer = self.get_serializer_class() serializer = self.get_serializer_class()
if hasattr(serializer, 'Meta') and hasattr(serializer.Meta, 'prefetch_related_fields'): if hasattr(serializer, 'Meta') and hasattr(serializer.Meta, 'prefetch_related_fields'):
queryset = queryset.prefetch_related(*serializer.Meta.prefetch_related_fields) queryset = queryset.prefetch_related(*serializer.Meta.prefetch_related_fields)
return queryset return queryset
def get_queryset(self):
queryset = Item.objects.all()
return self.prefetch_queryset(queryset)
def filter_items(items, query): def filter_items(items, query):
query_tokens = query.split(' ') query_tokens = query.split(' ')
@ -69,7 +72,7 @@ def item(request, event_slug):
if request.method == 'GET': if request.method == 'GET':
if not request.user.has_event_perm(event, 'view_item'): if not request.user.has_event_perm(event, 'view_item'):
return Response(status=403) return Response(status=403)
return Response(ItemSerializer(vs.get_queryset().filter(event=event), many=True).data) return Response(ItemSerializer(vs.prefetch_queryset(Item.objects.filter(event=event)), many=True).data)
elif request.method == 'POST': elif request.method == 'POST':
if not request.user.has_event_perm(event, 'add_item'): if not request.user.has_event_perm(event, 'add_item'):
return Response(status=403) return Response(status=403)
@ -108,7 +111,7 @@ def add_comment(request, event_slug, id):
def item_by_id(request, event_slug, id): def item_by_id(request, event_slug, id):
try: try:
event = Event.objects.get(slug=event_slug) event = Event.objects.get(slug=event_slug)
item = ItemViewSet().get_queryset().get(event=event, id=id) item = Item.objects.get(event=event, id=id)
if request.method == 'GET': if request.method == 'GET':
if not request.user.has_event_perm(event, 'view_item'): if not request.user.has_event_perm(event, 'view_item'):
return Response(status=403) return Response(status=403)