inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-04-30 12:36:45 +00:00
Code

fixed depreceated is_ajax (#6210)

Browse Source
This commit is contained in:
Matthias Mair 2024-01-12 00:06:25 +01:00 committed by GitHub
parent 8a764c2c05
commit b8369fb726
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
InvenTree/InvenTree/helpers.py
View File

@ -845,3 +845,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

@ -31,7 +31,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):
@ -256,7 +256,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:

5
InvenTree/part/api.py
View File

@ -33,6 +33,7 @@ from InvenTree.filters import (
from InvenTree.helpers import ( from InvenTree.helpers import (
DownloadFile, DownloadFile,
increment_serial_number, increment_serial_number,
is_ajax,
isNull, isNull,
str2bool, str2bool,
str2int, str2int,
@ -1123,7 +1124,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)
@ -1774,7 +1775,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)

5
InvenTree/stock/api.py
View File

@ -38,6 +38,7 @@ from InvenTree.filters import (
from InvenTree.helpers import ( from InvenTree.helpers import (
DownloadFile, DownloadFile,
extract_serial_numbers, extract_serial_numbers,
is_ajax,
isNull, isNull,
str2bool, str2bool,
str2int, str2int,
@ -1025,7 +1026,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)
@ -1396,7 +1397,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)