2025-summer/team-3
12
Fork 0
Code Issues Pull requests Projects Releases Activity

don't use is_ajax

Browse source
This commit is contained in:
Laura Klünder 2022-04-03 17:52:05 +02:00
parent 495294a886
commit 05d3530764
3 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/c3nav/editor/views/base.py
View file

@ -43,7 +43,7 @@ def sidebar_view(func=None, select_related=None, api_hybrid=False):
request.is_delete = request.method == 'DELETE' request.is_delete = request.method == 'DELETE'
return call_api_hybrid_view_for_api(func, request, *args, **kwargs) return call_api_hybrid_view_for_api(func, request, *args, **kwargs)
ajax = request.is_ajax() or 'ajax' in request.GET ajax = request.headers.get('x-requested-with') == 'XMLHttpRequest' or 'ajax' in request.GET
if not ajax: if not ajax:
request.META.pop('HTTP_IF_NONE_MATCH', None) request.META.pop('HTTP_IF_NONE_MATCH', None)

2
src/c3nav/site/templates/site/about.html
View file

@ -3,7 +3,7 @@
{% block content %} {% block content %}
<main class="account"> <main class="account">
{% if not request.mobileclient and not request.is_ajax %} {% if not request.mobileclient and not ajax %}
<a href="{% url 'site.index' %}" class="float-right">&laquo; {% trans 'back to c3nav' %}</a> <a href="{% url 'site.index' %}" class="float-right">&laquo; {% trans 'back to c3nav' %}</a>
{% endif %} {% endif %}
<h2>{% trans 'About c3nav' %}</h2> <h2>{% trans 'About c3nav' %}</h2>

4
src/c3nav/site/views.py
View file

@ -192,7 +192,8 @@ def qr_code(request, path):
def close_response(request): def close_response(request):
ajax = request.is_ajax() or 'ajax' in request.GET # todo: use a better way to recognize this
ajax = request.headers.get('x-requested-with') == 'XMLHttpRequest' or 'ajax' in request.GET
if ajax: if ajax:
return HttpResponse(json.dumps(get_user_data(request), cls=DjangoJSONEncoder).encode(), return HttpResponse(json.dumps(get_user_data(request), cls=DjangoJSONEncoder).encode(),
content_type='text/plain') content_type='text/plain')
@ -355,6 +356,7 @@ def choose_language(request):
@never_cache @never_cache
def about_view(request): def about_view(request):
return render(request, 'site/about.html', { return render(request, 'site/about.html', {
'ajax': request.headers.get('x-requested-with') == 'XMLHttpRequest' or 'ajax' in request.GET,
'address': settings.IMPRINT_ADDRESS, 'address': settings.IMPRINT_ADDRESS,
'patrons': settings.IMPRINT_PATRONS, 'patrons': settings.IMPRINT_PATRONS,
'team': settings.IMPRINT_TEAM, 'team': settings.IMPRINT_TEAM,