Projet

Général

Profil

0001-manager-redirect-users-add-to-user-creation-in-defau.patch

Frédéric Péters, 17 novembre 2018 16:16

Télécharger (2,38 ko)

Voir les différences: 

Subject: [PATCH] manager: redirect users/add to user creation in default OU
 (#28106)


 src/authentic2/manager/urls.py       | 2 ++
 src/authentic2/manager/user_views.py | 5 +++++
 tests/test_manager.py                | 5 +++++
 3 files changed, 12 insertions(+)
src/authentic2/manager/urls.py
21 21 
        url(r'^users/$', user_views.users, name='a2-manager-users'),
22 22 
        url(r'^users/export/(?P<format>csv|json|html|ods)/$',
23 23 
            user_views.users_export, name='a2-manager-users-export'),
24 
        url(r'^users/add/$', user_views.user_add_default_ou,
25 
            name='a2-manager-user-add-default-ou'),
24 26 
        url(r'^users/(?P<ou_pk>\d+)/add/$', user_views.user_add,
25 27 
            name='a2-manager-user-add'),
26 28 
        url(r'^users/(?P<pk>\d+)/$', user_views.user_detail,
src/authentic2/manager/user_views.py
146 146 
user_add = UserAddView.as_view()
147 147 

  		




  148
  148
  
    

  		




  
  149
  
    
def user_add_default_ou(request):

  		




  
  150
  
    
    ou = get_default_ou()

  		




  
  151
  
    
    return redirect(request, 'a2-manager-user-add', kwargs={'ou_pk': ou.id})

  		




  
  152
  
    

  		




  
  153
  
    

  		




  149
  154
  
    
class UserDetailView(OtherActionsMixin, BaseDetailView):

  		




  150
  155
  
    
    model = get_user_model()

  		




  151
  156
  
    
    fields = ['username', 'ou', 'first_name', 'last_name', 'email']

  		












  

    
      tests/test_manager.py
    
  





  283
  283
  
    
    response = form.submit()

  		




  284
  284
  
    
    assert 'Email already used' in response

  		




  285
  285
  
    

  		




  
  286
  
    
    # check redirect to default ou

  		




  
  287
  
    
    url1 = reverse('a2-manager-user-add-default-ou')

  		




  
  288
  
    
    url2 = reverse('a2-manager-user-add', kwargs={'ou_pk': get_default_ou().pk})

  		




  
  289
  
    
    resp = app.get(url1)

  		




  
  290
  
    
    assert urlparse(resp['Location']).path == url2

  		




  286
  291
  
    

  		




  287
  292
  
    
def test_app_setting_login_url(app, settings):

  		




  288
  293
  
    
    settings.A2_MANAGER_LOGIN_URL = '/other_login/'

  		




  289
  
  
    
-