return to manager after logout (fixes #25581)

This commit is contained in:
Benjamin Dauvergne 2018-08-03 17:46:12 +02:00
parent 7487686d7c
commit 6c3740b75d
2 changed files with 8 additions and 1 deletions

View File

@ -7,7 +7,7 @@
{% block page-title %}{% firstof manager_site_title site_title "Authentic2" %}{% endblock %}
{% block site-title %}{% firstof manager_site_title site_title "Authentic2" %}{% endblock %}
{% block logout-url %}{% url 'auth_logout' %}{% endblock %}
{% block logout-url %}{% url 'auth_logout' %}?next={{ request.get_full_path|urlencode }}{% endblock %}
{% block appbar %}
<h2>{% block page_title %}{{ title }}{% endblock %}</h2>

View File

@ -680,3 +680,10 @@ def test_manager_ou(app, superuser_or_admin, ou1):
assert len(ou_homepage.pyquery('span.true')) == 1
assert len(ou_homepage.pyquery('tr[data-pk="%s"] td.default span.true' % ou2.pk)) == 0
assert len(ou_homepage.pyquery('tr[data-pk="%s"] td.default span.true' % old_default.pk)) == 1
def test_return_on_logout(superuser, app):
'''Verify we will return to /manage/ after logout/login cycle'''
manager_home_page = login(app, superuser, reverse('a2-manager-homepage'))
response = manager_home_page.click('Logout').maybe_follow()
assert response.request.query_string == 'next=/manage/'