Skip to content

Commit 075aed7

Browse files
refactor: Replace deprecated request.is_ajax()
1 parent 9d21196 commit 075aed7

3 files changed

Lines changed: 15 additions & 3 deletions

File tree

ietf/community/views.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
from ietf.community.utils import states_of_significant_change, reset_name_contains_index_for_rule
2323
from ietf.doc.models import DocEvent, Document
2424
from ietf.doc.utils_search import prepare_document_table
25+
from ietf.utils.http import is_ajax
2526
from ietf.utils.response import permission_denied
2627

2728
def view_list(request, username=None):
@@ -142,7 +143,7 @@ def track_document(request, name, username=None, acronym=None):
142143
if not doc in clist.added_docs.all():
143144
clist.added_docs.add(doc)
144145

145-
if request.is_ajax():
146+
if is_ajax(request):
146147
return HttpResponse(json.dumps({ 'success': True }), content_type='application/json')
147148
else:
148149
return HttpResponseRedirect(clist.get_absolute_url())
@@ -162,7 +163,7 @@ def untrack_document(request, name, username=None, acronym=None):
162163
if clist.pk is not None:
163164
clist.added_docs.remove(doc)
164165

165-
if request.is_ajax():
166+
if is_ajax(request):
166167
return HttpResponse(json.dumps({ 'success': True }), content_type='application/json')
167168
else:
168169
return HttpResponseRedirect(clist.get_absolute_url())

ietf/doc/views_review.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
from ietf.utils.mail import send_mail_message
5454
from ietf.mailtrigger.utils import gather_address_lists
5555
from ietf.utils.fields import MultiEmailField
56+
from ietf.utils.http import is_ajax
5657
from ietf.utils.response import permission_denied
5758
from ietf.utils.timezone import date_today, DEADLINE_TZINFO
5859

@@ -1090,7 +1091,7 @@ def _generate_ajax_or_redirect_response(request, doc):
10901091
redirect_url = request.GET.get('next')
10911092
url_is_safe = is_safe_url(url=redirect_url, allowed_hosts=request.get_host(),
10921093
require_https=request.is_secure())
1093-
if request.is_ajax():
1094+
if is_ajax(request):
10941095
return HttpResponse(json.dumps({'success': True}), content_type='application/json')
10951096
elif url_is_safe:
10961097
return HttpResponseRedirect(redirect_url)

ietf/utils/http.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# Copyright The IETF Trust 2023, All Rights Reserved
2+
# -*- coding: utf-8 -*-
3+
4+
def is_ajax(request):
5+
"""Checks whether a request was an AJAX call
6+
7+
See https://docs.djangoproject.com/en/3.1/releases/3.1/#id2 - this implements the
8+
exact reproduction of the deprecated method suggested there.
9+
"""
10+
return request.headers.get("x-requested-with") == "XMLHttpRequest"

0 commit comments

Comments
 (0)