Projet

Général

Profil

0001-return-to-manager-after-logout-fixes-25581.patch

Benjamin Dauvergne, 03 août 2018 17:50

Télécharger (1,93 ko)

Voir les différences: 

Subject: [PATCH] return to manager after logout (fixes #25581)


 .../manager/templates/authentic2/manager/base.html         | 2 +-
 tests/test_manager.py                                      | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)
src/authentic2/manager/templates/authentic2/manager/base.html
7 7 
{% block page-title %}{% firstof manager_site_title site_title "Authentic2" %}{% endblock %}
8 8 
{% block site-title %}{% firstof manager_site_title site_title "Authentic2" %}{% endblock %}
9 9 

  		




  10
  
  
    
{% block logout-url %}{% url 'auth_logout' %}{% endblock %}

  		




  
  10
  
    
{% block logout-url %}{% url 'auth_logout' %}?next={{ request.get_full_path|urlencode }}{% endblock %}

  		




  11
  11
  
    

  		




  12
  12
  
    
{% block appbar %}

  		




  13
  13
  
    
  <h2>{% block page_title %}{{ title }}{% endblock %}</h2>

  		












  

    
      tests/test_manager.py
    
  





  680
  680
  
    
    assert len(ou_homepage.pyquery('span.true')) == 1

  		




  681
  681
  
    
    assert len(ou_homepage.pyquery('tr[data-pk="%s"] td.default span.true' % ou2.pk)) == 0

  		




  682
  682
  
    
    assert len(ou_homepage.pyquery('tr[data-pk="%s"] td.default span.true' % old_default.pk)) == 1

  		




  
  683
  
    

  		




  
  684
  
    

  		




  
  685
  
    
def test_return_on_logout(superuser, app):

  		




  
  686
  
    
    '''Verify we will return to /manage/ after logout/login cycle'''

  		




  
  687
  
    
    manager_home_page = login(app, superuser, reverse('a2-manager-homepage'))

  		




  
  688
  
    
    response = manager_home_page.click('Logout').maybe_follow()

  		




  
  689
  
    
    assert response.request.query_string == 'next=/manage/'

  		




  683
  
  
    
-