Move clef and listright to admin

users/views.py

@@ -9,7 +9,6 @@ from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
 from django.core.urlresolvers import reverse
 from django.db import IntegrityError
 from django.db import transaction
-from django.db.models import ProtectedError
 from django.shortcuts import get_object_or_404, render, redirect
 from django.template import loader
 from django.template.context_processors import csrf
@@ -20,9 +19,9 @@ from reversion.models import Version
 from med.settings import REQ_EXPIRE_STR, EMAIL_FROM, ASSO_NAME, ASSO_EMAIL, SITE_NAME, PAGINATION_NUMBER
 from media.models import Emprunt
 from users.decorators import user_is_in_campus
-from users.forms import DelListRightForm, NewListRightForm, ListRightForm, RightForm, DelRightForm
-from users.forms import InfoForm, BaseInfoForm, StateForm, ClefForm, AdhesionForm
+from users.forms import InfoForm, BaseInfoForm, AdhesionForm
 from users.forms import PassForm
+from users.forms import RightForm, DelRightForm
 from users.models import User, Request, ListRight, Right, Clef, Adhesion
 
 
@@ -111,26 +110,6 @@ def edit_info(request, userid):
     return form({'userform': user}, 'users/user.html', request)
 
 
-@login_required
-@permission_required('bureau')
-def state(request, userid):
-    """ Changer l'etat actif/desactivé/archivé d'un user, need droit bureau """
-    try:
-        user = User.objects.get(pk=userid)
-    except User.DoesNotExist:
-        messages.error(request, "Utilisateur inexistant")
-        return redirect("/users/")
-    state = StateForm(request.POST or None, instance=user)
-    if state.is_valid():
-        with transaction.atomic(), reversion.create_revision():
-            state.save()
-            reversion.set_user(request.user)
-            reversion.set_comment("Champs modifié(s) : %s" % ', '.join(field for field in state.changed_data))
-        messages.success(request, "Etat changé avec succès")
-        return redirect("/users/profil/" + userid)
-    return form({'userform': state}, 'users/user.html', request)
-
-
 @login_required
 def password(request, userid):
     """ Reinitialisation d'un mot de passe à partir de l'userid,
@@ -150,64 +129,6 @@ def password(request, userid):
     return form({'userform': u_form}, 'users/user.html', request)
 
 
-@login_required
-@permission_required('bureau')
-def add_listright(request):
-    """ Ajouter un droit/groupe, nécessite droit bureau.
-    Obligation de fournir un gid pour la synchro ldap, unique """
-    listright = NewListRightForm(request.POST or None)
-    if listright.is_valid():
-        with transaction.atomic(), reversion.create_revision():
-            listright.save()
-            reversion.set_user(request.user)
-            reversion.set_comment("Création")
-        messages.success(request, "Le droit/groupe a été ajouté")
-        return redirect("/users/index_listright/")
-    return form({'userform': listright}, 'users/user.html', request)
-
-
-@login_required
-@permission_required('bureau')
-def edit_listright(request, listrightid):
-    """ Editer un groupe/droit, necessite droit bureau, à partir du listright id """
-    try:
-        listright_instance = ListRight.objects.get(pk=listrightid)
-    except ListRight.DoesNotExist:
-        messages.error(request, u"Entrée inexistante")
-        return redirect("/users/")
-    listright = ListRightForm(request.POST or None, instance=listright_instance)
-    if listright.is_valid():
-        with transaction.atomic(), reversion.create_revision():
-            listright.save()
-            reversion.set_user(request.user)
-            reversion.set_comment("Champs modifié(s) : %s" % ', '.join(field for field in listright.changed_data))
-        messages.success(request, "Droit modifié")
-        return redirect("/users/index_listright/")
-    return form({'userform': listright}, 'users/user.html', request)
-
-
-@login_required
-@permission_required('bureau')
-def del_listright(request):
-    """ Supprimer un ou plusieurs groupe, possible si il est vide, need droit bureau """
-    listright = DelListRightForm(request.POST or None)
-    if listright.is_valid():
-        listright_dels = listright.cleaned_data['listrights']
-        for listright_del in listright_dels:
-            try:
-                with transaction.atomic(), reversion.create_revision():
-                    listright_del.delete()
-                    reversion.set_comment("Destruction")
-                messages.success(request, "Le droit/groupe a été supprimé")
-            except ProtectedError:
-                messages.error(
-                    request,
-                    "L'établissement %s est affecté à au moins un user, \
-                        vous ne pouvez pas le supprimer" % listright_del)
-        return redirect("/users/index_listright/")
-    return form({'userform': listright}, 'users/user.html', request)
-
-
 @login_required
 @permission_required('bureau')
 def add_right(request, userid):
@@ -253,64 +174,6 @@ def del_right(request):
     return form({'userform': user_right_list}, 'users/del_right.html', request)
 
 
-@login_required
-@permission_required('perm')
-def index_listright(request):
-    """ Affiche l'ensemble des droits , need droit perm """
-    listright_list = ListRight.objects.order_by('listright')
-    return render(request, 'users/index_listright.html', {'listright_list': listright_list})
-
-
-@login_required
-@permission_required('bureau')
-def add_clef(request):
-    clef = ClefForm(request.POST or None)
-    if clef.is_valid():
-        with transaction.atomic(), reversion.create_revision():
-            clef.save()
-            reversion.set_user(request.user)
-            reversion.set_comment("Création")
-        messages.success(request, "La clef a été ajouté")
-        return redirect("/users/index_clef/")
-    return form({'userform': clef}, 'users/user.html', request)
-
-
-@user_is_in_campus
-def edit_clef(request, clefid):
-    try:
-        clef_instance = Clef.objects.get(pk=clefid)
-    except Clef.DoesNotExist:
-        messages.error(request, u"Entrée inexistante")
-        return redirect("/users/index_clef/")
-    clef = ClefForm(request.POST or None, instance=clef_instance)
-    if clef.is_valid():
-        with transaction.atomic(), reversion.create_revision():
-            clef.save()
-            if request.user.is_authenticated:
-                reversion.set_user(request.user)
-            reversion.set_comment("Champs modifié(s) : %s" % ', '.join(field for field in clef.changed_data))
-        messages.success(request, "Clef modifié")
-        return redirect("/users/index_clef/")
-    return form({'userform': clef}, 'users/user.html', request)
-
-
-@login_required
-@permission_required('bureau')
-def del_clef(request, clefid):
-    try:
-        clef_instance = Clef.objects.get(pk=clefid)
-    except Clef.DoesNotExist:
-        messages.error(request, u"Entrée inexistante")
-        return redirect("/users/index_clef/")
-    if request.method == "POST":
-        with transaction.atomic(), reversion.create_revision():
-            clef_instance.delete()
-            reversion.set_user(request.user)
-            messages.success(request, "La clef a été détruite")
-        return redirect("/users/index_clef")
-    return form({'objet': clef_instance, 'objet_name': 'clef'}, 'users/delete.html', request)
-
-
 @user_is_in_campus
 def index_clef(request):
     clef_list = Clef.objects.all().order_by('nom')
@@ -444,12 +307,6 @@ def history(request, object, id):
         except Adhesion.DoesNotExist:
             messages.error(request, "Utilisateur inexistant")
             return redirect("/users/")
-    elif object == 'listright':
-        try:
-            object_instance = ListRight.objects.get(pk=id)
-        except ListRight.DoesNotExist:
-            messages.error(request, "Droit inexistant")
-            return redirect("/users/")
     else:
         messages.error(request, "Objet  inconnu")
         return redirect("/users/")