put user_data in request using middleware
This commit is contained in:
parent
01b703fad2
commit
e2a0efd24f
3 changed files with 13 additions and 3 deletions
|
@ -1,6 +1,8 @@
|
||||||
import re
|
import re
|
||||||
from functools import wraps
|
from functools import wraps
|
||||||
|
|
||||||
|
from c3nav.mapdata.utils.user import get_user_data_lazy
|
||||||
|
|
||||||
|
|
||||||
class NoLanguageMiddleware:
|
class NoLanguageMiddleware:
|
||||||
def __init__(self, get_response):
|
def __init__(self, get_response):
|
||||||
|
@ -38,3 +40,12 @@ def no_language(keep_content_language=False):
|
||||||
return response
|
return response
|
||||||
return wrapper
|
return wrapper
|
||||||
return decorator
|
return decorator
|
||||||
|
|
||||||
|
|
||||||
|
class GetUserDataMiddleware:
|
||||||
|
def __init__(self, get_response):
|
||||||
|
self.get_response = get_response
|
||||||
|
|
||||||
|
def __call__(self, request):
|
||||||
|
request.user_data = get_user_data_lazy(request)
|
||||||
|
return self.get_response(request)
|
||||||
|
|
|
@ -268,7 +268,6 @@ TEMPLATES = [
|
||||||
'django.template.context_processors.request',
|
'django.template.context_processors.request',
|
||||||
'django.contrib.auth.context_processors.auth',
|
'django.contrib.auth.context_processors.auth',
|
||||||
'django.contrib.messages.context_processors.messages',
|
'django.contrib.messages.context_processors.messages',
|
||||||
'c3nav.mapdata.context_processors.user_data',
|
|
||||||
],
|
],
|
||||||
'loaders': template_loaders
|
'loaders': template_loaders
|
||||||
},
|
},
|
||||||
|
|
|
@ -21,8 +21,8 @@
|
||||||
<header>
|
<header>
|
||||||
<h1><a href="{% block header_title_url %}/{% endblock %}">{% block header_title %}c3nav{% endblock %}</a></h1>
|
<h1><a href="{% block header_title_url %}/{% endblock %}">{% block header_title %}c3nav{% endblock %}</a></h1>
|
||||||
<a href="/account/" id="user">
|
<a href="/account/" id="user">
|
||||||
<span>{{ user_data.title }}</span>
|
<span>{{ request.user_data.title }}</span>
|
||||||
<small>{% if user_data.subtitle %}{{ user_data.subtitle }}{% endif %}</small>
|
<small>{% if request.user_data.subtitle %}{{ request.user_data.subtitle }}{% endif %}</small>
|
||||||
</a>
|
</a>
|
||||||
</header>
|
</header>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue