From 07dff729949b605f4553b4071000b40dc40f576e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Wed, 16 May 2018 11:01:43 +0200 Subject: [PATCH] misc: unify context processors into an extended one (#23856) --- wcs/context_processors.py | 10 +++++----- wcs/settings.py | 1 - 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/wcs/context_processors.py b/wcs/context_processors.py index 06ffcd2b..e8475889 100644 --- a/wcs/context_processors.py +++ b/wcs/context_processors.py @@ -14,10 +14,10 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, see . -from quixote import get_publisher, get_response +from quixote import get_publisher, get_response, get_request def publisher(request): - return {'publisher': get_publisher} - -def response(request): - return {'response': get_response} + return {'publisher': get_publisher, + 'response': get_response, + 'user': lambda: get_request() and get_request().user, + } diff --git a/wcs/settings.py b/wcs/settings.py index edef715f..0382d385 100644 --- a/wcs/settings.py +++ b/wcs/settings.py @@ -99,7 +99,6 @@ TEMPLATES = [ "django.template.context_processors.tz", "django.contrib.messages.context_processors.messages", "wcs.context_processors.publisher", - "wcs.context_processors.response", ], 'loaders': [ 'wcs.utils.TemplateLoader', -- 2.17.0