Projet

Général

Profil

0001-cancel-user-add-set-correct-location-29181.patch

Emmanuel Cazenave, 18 décembre 2018 17:02

Télécharger (2,34 ko)

Voir les différences: 

Subject: [PATCH] cancel user add: set correct location (#29181)


 src/authentic2/manager/user_views.py |  1 +
 tests/test_manager.py                | 16 +++-------------
 2 files changed, 4 insertions(+), 13 deletions(-)
src/authentic2/manager/user_views.py
138 138 
        context['ou'] = self.ou
139 139 
        if hasattr(self.request, 'GET') and 'next' in self.request.GET:
140 140 
            context['next'] = self.request.GET['next']
141 
            context['cancel_url'] = self.request.GET['next']
141 142 
        return context
142 143 

  		




  143
  144
  
    
    def form_valid(self, form):

  		












  

    
      tests/test_manager.py
    
  





  746
  746
  
    
    url = u'/manage/users/%s/add/?next=%s' % (ou1.pk, next_url)

  		




  747
  747
  
    
    login(app, superuser_or_admin, '/manage/')

  		




  748
  748
  
    
    response = app.get(url)

  		




  749
  
  
    
    form = response.form

  		




  750
  
  
    
    form.set('first_name', 'John')

  		




  751
  
  
    
    form.set('last_name', 'Doe')

  		




  752
  
  
    
    form.set('email', 'john.doe@gmail.com')

  		




  753
  
  
    
    form.set('password1', 'ABcd1234')

  		




  754
  
  
    
    form.set('password2', 'ABcd1234')

  		




  755
  
  
    
    assert form.submit().location == next_url

  		




  756
  749
  
    

  		




  
  750
  
    
    # cancel if not handled through form submission

  		




  
  751
  
    
    assert response.pyquery.remove_namespaces()('a.cancel').attr('href') == next_url

  		




  757
  752
  
    

  		




  758
  
  
    
def test_manager_create_user_next_form_cancelation(superuser_or_admin, app, ou1):

  		




  759
  
  
    
    next_url = u'https://example.nowhere.null/'

  		




  760
  
  
    
    url = u'/manage/users/%s/add/?next=%s' % (ou1.pk, next_url)

  		




  761
  
  
    
    login(app, superuser_or_admin, '/manage/')

  		




  762
  
  
    
    response = app.get(url)

  		




  763
  753
  
    
    form = response.form

  		




  764
  754
  
    
    form.set('first_name', 'John')

  		




  765
  755
  
    
    form.set('last_name', 'Doe')

  		




  766
  756
  
    
    form.set('email', 'john.doe@gmail.com')

  		




  767
  757
  
    
    form.set('password1', 'ABcd1234')

  		




  768
  758
  
    
    form.set('password2', 'ABcd1234')

  		




  769
  
  
    
    assert form.submit('cancel').location == next_url

  		




  
  759
  
    
    assert form.submit().location == next_url

  		




  770
  760
  
    

  		




  771
  761
  
    

  		




  772
  762
  
    
def test_manager_create_user_next_form_error(superuser_or_admin, app, ou1):

  		




  773
  
  
    
-