diff --git a/python/nav/web/auth/middleware.py b/python/nav/web/auth/middleware.py index ed46f07bf1..8c6bc9f0e5 100644 --- a/python/nav/web/auth/middleware.py +++ b/python/nav/web/auth/middleware.py @@ -30,6 +30,7 @@ authorization_not_required, ) from nav.web.auth.sudo import get_sudoer +from nav.web.utils import is_ajax _logger = logging.getLogger(__name__) @@ -107,7 +108,7 @@ def redirect_to_login(self, request): response. """ - if request.is_ajax(): + if is_ajax(request): return HttpResponse(status=401) new_url = get_login_url(request) diff --git a/python/nav/web/syslogger/views.py b/python/nav/web/syslogger/views.py index 16f30a1378..068f7c04f9 100644 --- a/python/nav/web/syslogger/views.py +++ b/python/nav/web/syslogger/views.py @@ -32,7 +32,7 @@ from nav.models.logger import LogMessage from nav.models.logger import ErrorError from nav.web.syslogger.forms import LoggerGroupSearchForm -from nav.web.utils import create_title +from nav.web.utils import create_title, is_ajax DATEFORMAT = "%Y-%m-%d %H:%M:%S" @@ -204,7 +204,7 @@ def index(request): def group_search(request): - if not request.is_ajax(): + if not is_ajax(request): return HttpResponseRedirect(reverse(index) + '?' + request.GET.urlencode()) return handle_search(request, LoggerGroupSearchForm, reverse(group_search)) @@ -213,7 +213,7 @@ def exceptions_response(request): """ Handler for exception-mode. """ - if not request.is_ajax(): + if not is_ajax(request): return HttpResponseRedirect(reverse(index) + '?' + request.GET.urlencode()) account = get_account(request) @@ -236,7 +236,7 @@ def errors_response(request): """ Handler for error-mode. """ - if not request.is_ajax(): + if not is_ajax(request): return HttpResponseRedirect(reverse(index) + '?' + request.GET.urlencode()) account = get_account(request) diff --git a/python/nav/web/utils.py b/python/nav/web/utils.py index f5abb163c6..3016f016fe 100644 --- a/python/nav/web/utils.py +++ b/python/nav/web/utils.py @@ -26,6 +26,10 @@ import qrcode.image.pil +def is_ajax(request): + return request.headers.get("x-requested-with") == "XMLHttpRequest" + + def get_navpath_root(): """Returns the default navpath root