From 40cb2b45bb8252a18beacd4104d9ef5ba76f1800 Mon Sep 17 00:00:00 2001 From: Santiago Lamora Date: Fri, 26 Jan 2024 13:58:51 +0100 Subject: [PATCH] Upgrade to be compatible with django 3.2 --- orchestra/contrib/musician/__init__.py | 1 - orchestra/contrib/musician/views.py | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/orchestra/contrib/musician/__init__.py b/orchestra/contrib/musician/__init__.py index b4562ad6..e69de29b 100644 --- a/orchestra/contrib/musician/__init__.py +++ b/orchestra/contrib/musician/__init__.py @@ -1 +0,0 @@ -default_app_config = 'orchestra.contrib.musician.apps.MusicianConfig' diff --git a/orchestra/contrib/musician/views.py b/orchestra/contrib/musician/views.py index a89fd0fb..f2310401 100644 --- a/orchestra/contrib/musician/views.py +++ b/orchestra/contrib/musician/views.py @@ -12,7 +12,7 @@ from django.shortcuts import get_object_or_404 from django.urls import reverse_lazy from django.utils import translation from django.utils.html import format_html -from django.utils.http import is_safe_url +from django.utils.http import url_has_allowed_host_and_scheme from django.utils.translation import gettext_lazy as _ from django.views import View from django.views.generic.base import RedirectView, TemplateView @@ -153,7 +153,7 @@ def profile_set_language(request, code): translation.activate(user_language) redirect_to = request.GET.get('next', '') - url_is_safe = is_safe_url( + url_is_safe = url_has_allowed_host_and_scheme( url=redirect_to, allowed_hosts={request.get_host()}, require_https=request.is_secure(), @@ -232,7 +232,7 @@ class BillDownloadView(CustomContextMixin, UserTokenRequiredMixin, View): bill = self.get_object() # TODO(@slamora): implement download as PDF, now only HTML is reachable via link - content_type = request.META.get('HTTP_ACCEPT') + content_type = request.headers.get('accept') if content_type == 'application/pdf': pdf = html_to_pdf(bill.html or bill.render()) return HttpResponse(pdf, content_type='application/pdf') @@ -545,7 +545,7 @@ class LoginView(FormView): self.redirect_field_name, self.request.GET.get(self.redirect_field_name, '') ) - url_is_safe = is_safe_url( + url_is_safe = url_has_allowed_host_and_scheme( url=redirect_to, allowed_hosts={self.request.get_host()}, require_https=self.request.is_secure(),