Merge branch 'master' into 'profil_frontend'

# Conflicts:
#   users/views.py

topologie/views.py

@@ -181,7 +181,7 @@ def index_ap(request):
 def index_stack(request):
     """Affichage de la liste des stacks (affiche l'ensemble des switches)"""
     stack_list = Stack.objects\
-        .prefetch_related('switch_set__domain__extension')
+        .prefetch_related('switch_set__interface_set__domain__extension')
     stack_list = SortTable.sort(
         stack_list,
         request.GET.get('col'),

users/urls.py

@@ -45,12 +45,12 @@ urlpatterns = [
     url(r'^del_group/(?P<userid>[0-9]+)/(?P<listrightid>[0-9]+)$', views.del_group, name='del-group'),
     url(r'^new_serviceuser/$', views.new_serviceuser, name='new-serviceuser'),
     url(
-        r'^edit_serviceuser/(?P<userid>[0-9]+)$',
+        r'^edit_serviceuser/(?P<serviceuserid>[0-9]+)$',
         views.edit_serviceuser,
         name='edit-serviceuser'
     ),
     url(
-        r'^del_serviceuser/(?P<userid>[0-9]+)$',
+        r'^del_serviceuser/(?P<serviceuserid>[0-9]+)$',
         views.del_serviceuser,
         name='del-serviceuser'
     ),

users/views.py

@@ -275,7 +275,7 @@ def new_serviceuser(request):
 
 @login_required
 @can_edit(ServiceUser)
-def edit_serviceuser(request, user, userid):
+def edit_serviceuser(request, serviceuser, serviceuserid):
     """ Edit a ServiceUser """
     user = EditServiceUserForm(request.POST or None, instance=user)
     if user.is_valid():
@@ -286,19 +286,19 @@ def edit_serviceuser(request, user, userid):
             user_object.save()
         messages.success(request, "L'user a bien été modifié")
         return redirect(reverse('users:index-serviceusers'))
-    return form({'userform': user, 'action_name':'Editer un serviceuser'}, 'users/user.html', request)
+    return form({'userform': serviceuser, 'action_name':'Editer un serviceuser'}, 'users/user.html', request)
 
 
 @login_required
 @can_delete(ServiceUser)
-def del_serviceuser(request, user, userid):
+def del_serviceuser(request, serviceuser, serviceuserid):
     """Suppression d'un ou plusieurs serviceusers"""
     if request.method == "POST":
         user.delete()
         messages.success(request, "L'user a été détruite")
         return redirect(reverse('users:index-serviceusers'))
     return form(
-        {'objet': user, 'objet_name': 'serviceuser'},
+        {'objet': serviceuser, 'objet_name': 'serviceuser'},
         'users/delete.html',
         request
     )