mirror of
https://github.com/inventree/InvenTree.git
synced 2025-05-01 21:16:46 +00:00
Remove dead code (#7265)
* Remove dead code - Previously custom LIST was required - Improvements render this unnecessary now * Remove unused imports
This commit is contained in:
parent
442bb73262
commit
2ebe785a75
@ -4,7 +4,6 @@ import functools
|
|||||||
import re
|
import re
|
||||||
|
|
||||||
from django.db.models import Count, F, Q
|
from django.db.models import Count, F, Q
|
||||||
from django.http import JsonResponse
|
|
||||||
from django.urls import include, path, re_path
|
from django.urls import include, path, re_path
|
||||||
from django.utils.translation import gettext_lazy as _
|
from django.utils.translation import gettext_lazy as _
|
||||||
|
|
||||||
@ -32,13 +31,7 @@ from InvenTree.filters import (
|
|||||||
InvenTreeDateFilter,
|
InvenTreeDateFilter,
|
||||||
InvenTreeSearchFilter,
|
InvenTreeSearchFilter,
|
||||||
)
|
)
|
||||||
from InvenTree.helpers import (
|
from InvenTree.helpers import DownloadFile, increment_serial_number, isNull, str2bool
|
||||||
DownloadFile,
|
|
||||||
increment_serial_number,
|
|
||||||
is_ajax,
|
|
||||||
isNull,
|
|
||||||
str2bool,
|
|
||||||
)
|
|
||||||
from InvenTree.mixins import (
|
from InvenTree.mixins import (
|
||||||
CreateAPI,
|
CreateAPI,
|
||||||
CustomRetrieveUpdateDestroyAPI,
|
CustomRetrieveUpdateDestroyAPI,
|
||||||
@ -1216,33 +1209,6 @@ class PartList(PartMixin, APIDownloadMixin, ListCreateAPI):
|
|||||||
|
|
||||||
return DownloadFile(filedata, filename)
|
return DownloadFile(filedata, filename)
|
||||||
|
|
||||||
def list(self, request, *args, **kwargs):
|
|
||||||
"""Override the 'list' method, as the PartCategory objects are very expensive to serialize!
|
|
||||||
|
|
||||||
So we will serialize them first, and keep them in memory, so that they do not have to be serialized multiple times...
|
|
||||||
"""
|
|
||||||
queryset = self.filter_queryset(self.get_queryset())
|
|
||||||
|
|
||||||
page = self.paginate_queryset(queryset)
|
|
||||||
|
|
||||||
if page is not None:
|
|
||||||
serializer = self.get_serializer(page, many=True)
|
|
||||||
else:
|
|
||||||
serializer = self.get_serializer(queryset, many=True)
|
|
||||||
|
|
||||||
data = serializer.data
|
|
||||||
|
|
||||||
"""
|
|
||||||
Determine the response type based on the request.
|
|
||||||
a) For HTTP requests (e.g. via the browsable API) return a DRF response
|
|
||||||
b) For AJAX requests, simply return a JSON rendered response.
|
|
||||||
"""
|
|
||||||
if page is not None:
|
|
||||||
return self.get_paginated_response(data)
|
|
||||||
elif is_ajax(request):
|
|
||||||
return JsonResponse(data, safe=False)
|
|
||||||
return Response(data)
|
|
||||||
|
|
||||||
def filter_queryset(self, queryset):
|
def filter_queryset(self, queryset):
|
||||||
"""Perform custom filtering of the queryset."""
|
"""Perform custom filtering of the queryset."""
|
||||||
params = self.request.query_params
|
params = self.request.query_params
|
||||||
@ -1890,30 +1856,6 @@ class BomList(BomMixin, ListCreateDestroyAPIView):
|
|||||||
|
|
||||||
filterset_class = BomFilter
|
filterset_class = BomFilter
|
||||||
|
|
||||||
def list(self, request, *args, **kwargs):
|
|
||||||
"""Return serialized list response for this endpoint."""
|
|
||||||
queryset = self.filter_queryset(self.get_queryset())
|
|
||||||
|
|
||||||
page = self.paginate_queryset(queryset)
|
|
||||||
|
|
||||||
if page is not None:
|
|
||||||
serializer = self.get_serializer(page, many=True)
|
|
||||||
else:
|
|
||||||
serializer = self.get_serializer(queryset, many=True)
|
|
||||||
|
|
||||||
data = serializer.data
|
|
||||||
|
|
||||||
"""
|
|
||||||
Determine the response type based on the request.
|
|
||||||
a) For HTTP requests (e.g. via the browsable API) return a DRF response
|
|
||||||
b) For AJAX requests, simply return a JSON rendered response.
|
|
||||||
"""
|
|
||||||
if page is not None:
|
|
||||||
return self.get_paginated_response(data)
|
|
||||||
elif is_ajax(request):
|
|
||||||
return JsonResponse(data, safe=False)
|
|
||||||
return Response(data)
|
|
||||||
|
|
||||||
filter_backends = SEARCH_ORDER_FILTER_ALIAS
|
filter_backends = SEARCH_ORDER_FILTER_ALIAS
|
||||||
|
|
||||||
search_fields = [
|
search_fields = [
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
"""JSON API for the Stock app."""
|
"""JSON API for the Stock app."""
|
||||||
|
|
||||||
from collections import OrderedDict
|
from collections import OrderedDict
|
||||||
from datetime import datetime, timedelta
|
from datetime import timedelta
|
||||||
|
|
||||||
from django.core.exceptions import ValidationError as DjangoValidationError
|
from django.core.exceptions import ValidationError as DjangoValidationError
|
||||||
from django.db import transaction
|
from django.db import transaction
|
||||||
@ -45,7 +45,6 @@ from InvenTree.helpers import (
|
|||||||
is_ajax,
|
is_ajax,
|
||||||
isNull,
|
isNull,
|
||||||
str2bool,
|
str2bool,
|
||||||
str2int,
|
|
||||||
)
|
)
|
||||||
from InvenTree.mixins import (
|
from InvenTree.mixins import (
|
||||||
CreateAPI,
|
CreateAPI,
|
||||||
@ -1055,36 +1054,6 @@ class StockList(APIDownloadMixin, ListCreateDestroyAPIView):
|
|||||||
|
|
||||||
return DownloadFile(filedata, filename)
|
return DownloadFile(filedata, filename)
|
||||||
|
|
||||||
def list(self, request, *args, **kwargs):
|
|
||||||
"""Override the 'list' method, as the StockLocation objects are very expensive to serialize.
|
|
||||||
|
|
||||||
So, we fetch and serialize the required StockLocation objects only as required.
|
|
||||||
"""
|
|
||||||
queryset = self.filter_queryset(self.get_queryset())
|
|
||||||
|
|
||||||
page = self.paginate_queryset(queryset)
|
|
||||||
|
|
||||||
if page is not None:
|
|
||||||
serializer = self.get_serializer(page, many=True)
|
|
||||||
else:
|
|
||||||
serializer = self.get_serializer(queryset, many=True)
|
|
||||||
|
|
||||||
data = serializer.data
|
|
||||||
|
|
||||||
"""
|
|
||||||
Determine the response type based on the request.
|
|
||||||
a) For HTTP requests (e.g. via the browsable API) return a DRF response
|
|
||||||
b) For AJAX requests, simply return a JSON rendered response.
|
|
||||||
|
|
||||||
Note: b) is about 100x quicker than a), because the DRF framework adds a lot of cruft
|
|
||||||
"""
|
|
||||||
|
|
||||||
if page is not None:
|
|
||||||
return self.get_paginated_response(data)
|
|
||||||
elif is_ajax(request):
|
|
||||||
return JsonResponse(data, safe=False)
|
|
||||||
return Response(data)
|
|
||||||
|
|
||||||
def get_queryset(self, *args, **kwargs):
|
def get_queryset(self, *args, **kwargs):
|
||||||
"""Annotate queryset before returning."""
|
"""Annotate queryset before returning."""
|
||||||
queryset = super().get_queryset(*args, **kwargs)
|
queryset = super().get_queryset(*args, **kwargs)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user