entrouvert
/
univnautes
Archived
17
0
Fork 0
Code Issues Pull Requests Releases Activity

fix next_url cookie, don't store "None" (#5819)

This commit is contained in:
Thomas NOËL 2014-10-29 15:51:34 +01:00
parent adcce0a3ed
commit beead36d26
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
usr/local/univnautes/sp/sp/templates/homepage.html
View File

@ -1,6 +1,6 @@
{% extends "base.html" %}
{% block meta %}
{% if redirect_url %} <meta http-equiv="refresh" content="{{ redirect_delay }}; URL={{ redirect_url }}" />{% endif %}
{% if redirect_url %}<meta http-equiv="refresh" content="{{ redirect_delay }}; URL={{ redirect_url }}" />{% endif %}
{% endblock %}
{% load static %}
@ -32,8 +32,9 @@ avez maintenant accès au réseau.
</h2>
{% if redirect_url %}
<p>Vous allez être redirigé vers <a href="{{ redirect_url }}">{{ redirect_url }}</a>{% if redirect_delay %} dans
{{ redirect_delay }} seconde(s) {% endif %}</p>
<p>Redirection vers le site <a href="{{ redirect_url }}">{{ redirect_url }}</a>
{% if redirect_delay %} (dans {{ redirect_delay }} seconde{% if redirect_delay > 1 %}s{% endif %}…)
{% endif %}</p>
{% endif %}
<p>

5
usr/local/univnautes/sp/sp/views.py
View File

@ -36,7 +36,8 @@ class Homepage(TemplateView):
url, delay = get_redirect_params()
if url == 'next_url':
url = self.request.COOKIES.get(url, '')
url = Template(url).render(Context(context))
else:
url = Template(url).render(Context(context))
context.update({'redirect_url': url,
'redirect_delay': delay})
return context
@ -45,7 +46,7 @@ homepage = login_required(Homepage.as_view())
def login(request):
response = django_login(request)
response.set_cookie('next_url', request.GET.get('next'), path='/')
response.set_cookie('next_url', request.GET.get('next', ''), path='/')
return response
def proxymap(request, z, x, y):