inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-05-03 13:58:47 +00:00
Code

fixed depreceated is_ajax (#6210) (#6216)

Browse Source 
* fixed depreceated is_ajax (#6210)

* File cleanup

---------

Co-authored-by: Matthias Mair <code@mjmair.com>
This commit is contained in:
Oliver 2024-01-12 22:23:23 +11:00 committed by GitHub
parent 421081b8f6
commit a6693d3bf8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
InvenTree/InvenTree/helpers.py
View File

@ -840,3 +840,8 @@ def inheritors(cls):
subcls.add(child) subcls.add(child)
work.append(child) work.append(child)
return subcls return subcls
def is_ajax(request):
"""Check if the current request is an AJAX request."""
return request.headers.get('x-requested-with') == 'XMLHttpRequest'

4
InvenTree/InvenTree/views.py
View File

@ -33,7 +33,7 @@ from part.models import PartCategory
from users.models import RuleSet, check_user_role from users.models import RuleSet, check_user_role
from .forms import EditUserForm, SetPasswordForm from .forms import EditUserForm, SetPasswordForm
from .helpers import remove_non_printable_characters, strip_html_tags from .helpers import is_ajax, remove_non_printable_characters, strip_html_tags
def auth_request(request): def auth_request(request):
@ -258,7 +258,7 @@ class AjaxMixin(InvenTreeRoleMixin):
if not data: if not data:
data = {} data = {}
if not request.is_ajax(): if not is_ajax(request):
return HttpResponseRedirect('/') return HttpResponseRedirect('/')
if context is None: if context is None:

8
InvenTree/part/api.py
View File

@ -22,8 +22,8 @@ from InvenTree.api import (APIDownloadMixin, AttachmentMixin,
from InvenTree.filters import (ORDER_FILTER, SEARCH_ORDER_FILTER, from InvenTree.filters import (ORDER_FILTER, SEARCH_ORDER_FILTER,
SEARCH_ORDER_FILTER_ALIAS, InvenTreeDateFilter, SEARCH_ORDER_FILTER_ALIAS, InvenTreeDateFilter,
InvenTreeSearchFilter) InvenTreeSearchFilter)
from InvenTree.helpers import (DownloadFile, increment_serial_number, isNull, from InvenTree.helpers import (DownloadFile, increment_serial_number, is_ajax,
str2bool, str2int) isNull, str2bool, str2int)
from InvenTree.mixins import (CreateAPI, CustomRetrieveUpdateDestroyAPI, from InvenTree.mixins import (CreateAPI, CustomRetrieveUpdateDestroyAPI,
ListAPI, ListCreateAPI, RetrieveAPI, ListAPI, ListCreateAPI, RetrieveAPI,
RetrieveUpdateAPI, RetrieveUpdateDestroyAPI, RetrieveUpdateAPI, RetrieveUpdateDestroyAPI,
@ -1069,7 +1069,7 @@ class PartList(PartMixin, APIDownloadMixin, ListCreateAPI):
""" """
if page is not None: if page is not None:
return self.get_paginated_response(data) return self.get_paginated_response(data)
elif request.is_ajax(): elif is_ajax(request):
return JsonResponse(data, safe=False) return JsonResponse(data, safe=False)
return Response(data) return Response(data)
@ -1740,7 +1740,7 @@ class BomList(BomMixin, ListCreateDestroyAPIView):
""" """
if page is not None: if page is not None:
return self.get_paginated_response(data) return self.get_paginated_response(data)
elif request.is_ajax(): elif is_ajax(request):
return JsonResponse(data, safe=False) return JsonResponse(data, safe=False)
return Response(data) return Response(data)

8
InvenTree/stock/api.py
View File

@ -27,8 +27,8 @@ from InvenTree.api import (APIDownloadMixin, AttachmentMixin,
ListCreateDestroyAPIView, MetadataView) ListCreateDestroyAPIView, MetadataView)
from InvenTree.filters import (ORDER_FILTER, SEARCH_ORDER_FILTER, from InvenTree.filters import (ORDER_FILTER, SEARCH_ORDER_FILTER,
SEARCH_ORDER_FILTER_ALIAS, InvenTreeDateFilter) SEARCH_ORDER_FILTER_ALIAS, InvenTreeDateFilter)
from InvenTree.helpers import (DownloadFile, extract_serial_numbers, isNull, from InvenTree.helpers import (DownloadFile, extract_serial_numbers, is_ajax,
str2bool, str2int) isNull, str2bool, str2int)
from InvenTree.mixins import (CreateAPI, CustomRetrieveUpdateDestroyAPI, from InvenTree.mixins import (CreateAPI, CustomRetrieveUpdateDestroyAPI,
ListAPI, ListCreateAPI, RetrieveAPI, ListAPI, ListCreateAPI, RetrieveAPI,
RetrieveUpdateDestroyAPI) RetrieveUpdateDestroyAPI)
@ -963,7 +963,7 @@ class StockList(APIDownloadMixin, ListCreateDestroyAPIView):
if page is not None: if page is not None:
return self.get_paginated_response(data) return self.get_paginated_response(data)
elif request.is_ajax(): elif is_ajax(request):
return JsonResponse(data, safe=False) return JsonResponse(data, safe=False)
return Response(data) return Response(data)
@ -1346,7 +1346,7 @@ class StockTrackingList(ListAPI):
if page is not None: if page is not None:
return self.get_paginated_response(data) return self.get_paginated_response(data)
if request.is_ajax(): if is_ajax(request):
return JsonResponse(data, safe=False) return JsonResponse(data, safe=False)
return Response(data) return Response(data)