From 2cd9b45e9b75f10b26a60a1adc53098c634b7cf5 Mon Sep 17 00:00:00 2001 From: Valentin Deniaud Date: Mon, 3 Oct 2022 17:53:22 +0200 Subject: [PATCH 1/3] misc: allow new request.headers usage (#69809) --- wcs/compat.py | 4 ++-- wcs/qommon/http_request.py | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/wcs/compat.py b/wcs/compat.py index d37a88cf4..2ced96fea 100644 --- a/wcs/compat.py +++ b/wcs/compat.py @@ -62,7 +62,7 @@ class TemplateWithFallbackView(TemplateView): response = HttpResponse(body) response.status_code = self.quixote_response.status_code response.reason_phrase = self.quixote_response.reason_phrase - elif request.META.get('HTTP_X_POPUP') == 'true': + elif request.headers.get('X-Popup') == 'true': response = HttpResponse('
%s
' % context['body']) elif 'raw' in (getattr(self.quixote_response, 'filter') or {}): # used for theme preview (generated in /backoffice/ but cannot @@ -143,7 +143,7 @@ class CompatWcsPublisher(WcsPublisher): return output if not hasattr(response, 'filter') or not response.filter: return output - if request.META.get('HTTP_X_POPUP') == 'true': + if request.headers.get('X-Popup') == 'true': return '
%s
' % output if response.filter and response.filter.get('admin_ezt'): return self.render_response(output) diff --git a/wcs/qommon/http_request.py b/wcs/qommon/http_request.py index 653947903..f36f06896 100644 --- a/wcs/qommon/http_request.py +++ b/wcs/qommon/http_request.py @@ -20,6 +20,7 @@ import re import time import quixote.http_request +from django.http.request import HttpHeaders from django.utils.encoding import force_bytes, force_text from quixote import get_publisher, get_session from quixote.errors import RequestError @@ -238,5 +239,9 @@ class HTTPRequest(quixote.http_request.HTTPRequest): def META(self): return self.environ + @property + def headers(self): + return HttpHeaders(self.META) + def trace(self, msg): print('%.4f' % (time.time() - self.t0), msg) -- 2.35.1