mirror of
https://gitlab.crans.org/mediatek/med.git
synced 2025-07-06 04:03:53 +02:00
Clean up of users app
This commit is contained in:
Alexandre Iooss
112
users/views.py
112
users/views.py
@ -5,24 +5,21 @@
|
||||
from django.contrib import messages
|
||||
from django.contrib.auth.decorators import login_required, permission_required
|
||||
from django.core.mail import send_mail
|
||||
from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
|
||||
from django.core.paginator import EmptyPage, PageNotAnInteger, Paginator
|
||||
from django.core.urlresolvers import reverse
|
||||
from django.db import IntegrityError
|
||||
from django.db import transaction
|
||||
from django.shortcuts import get_object_or_404, render, redirect
|
||||
from django.shortcuts import get_object_or_404, redirect, render
|
||||
from django.template import loader
|
||||
from django.template.context_processors import csrf
|
||||
from django.utils import timezone
|
||||
from reversion import revisions as reversion
|
||||
from reversion.models import Version
|
||||
|
||||
from med.settings import REQ_EXPIRE_STR, EMAIL_FROM, ASSO_NAME, ASSO_EMAIL, SITE_NAME, PAGINATION_NUMBER
|
||||
from med.settings import ASSO_EMAIL, ASSO_NAME, EMAIL_FROM, \
|
||||
PAGINATION_NUMBER, REQ_EXPIRE_STR, SITE_NAME
|
||||
from media.models import Emprunt
|
||||
from users.decorators import user_is_in_campus
|
||||
from users.forms import InfoForm, BaseInfoForm, AdhesionForm
|
||||
from users.forms import BaseInfoForm, InfoForm
|
||||
from users.forms import PassForm
|
||||
from users.forms import RightForm, DelRightForm
|
||||
from users.models import User, Request, ListRight, Right, Clef, Adhesion
|
||||
from users.models import Adhesion, Clef, Request, Right, User
|
||||
|
||||
|
||||
def form(ctx, template, request):
|
||||
@ -48,7 +45,9 @@ def password_change_action(u_form, user, request, req=False):
|
||||
|
||||
|
||||
def reset_passwd_mail(req, request):
|
||||
""" Prend en argument un request, envoie un mail de réinitialisation de mot de pass """
|
||||
"""
|
||||
Envoie un mail de réinitialisation de mot de passe
|
||||
"""
|
||||
t = loader.get_template('users/email_passwd_request')
|
||||
c = {
|
||||
'name': str(req.user.first_name) + ' ' + str(req.user.last_name),
|
||||
@ -67,7 +66,9 @@ def reset_passwd_mail(req, request):
|
||||
@login_required
|
||||
@permission_required('bureau')
|
||||
def new_user(request):
|
||||
""" Vue de création d'un nouvel utilisateur, envoie un mail pour le mot de passe"""
|
||||
"""
|
||||
Vue de création d'un nouvel utilisateur
|
||||
"""
|
||||
user = BaseInfoForm(request.POST or None)
|
||||
if user.is_valid():
|
||||
user = user.save(commit=False)
|
||||
@ -80,21 +81,29 @@ def new_user(request):
|
||||
req.save()
|
||||
reset_passwd_mail(req, request)
|
||||
messages.success(request,
|
||||
"L'utilisateur %s a été crée, un mail pour l'initialisation du mot de passe a été envoyé" % user.username)
|
||||
"L'utilisateur %s a été crée, un mail pour "
|
||||
"l'initialisation du mot de passe a été "
|
||||
"envoyé" % user.username)
|
||||
return redirect("/users/profil/" + str(user.id))
|
||||
return form({'userform': user}, 'users/user.html', request)
|
||||
|
||||
|
||||
@login_required
|
||||
def edit_info(request, userid):
|
||||
""" Edite un utilisateur à partir de son id, si l'id est différent de request.user, vérifie la possession du droit admin """
|
||||
"""
|
||||
Edite un utilisateur à partir de son id,
|
||||
si l'id est différent de request.user,
|
||||
vérifie la possession du droit admin
|
||||
"""
|
||||
try:
|
||||
user = User.objects.get(pk=userid)
|
||||
except User.DoesNotExist:
|
||||
messages.error(request, "Utilisateur inexistant")
|
||||
return redirect("/users/")
|
||||
if not request.user.has_perms(('bureau',)) and user != request.user:
|
||||
messages.error(request, "Vous ne pouvez pas modifier un autre user que vous sans droit admin")
|
||||
messages.error(request,
|
||||
"Vous ne pouvez pas modifier un autre user que vous "
|
||||
"sans droit admin")
|
||||
return redirect("/users/profil/" + str(request.user.id))
|
||||
if not request.user.has_perms(('bureau',)):
|
||||
user = BaseInfoForm(request.POST or None, instance=user)
|
||||
@ -104,7 +113,8 @@ def edit_info(request, userid):
|
||||
with transaction.atomic(), reversion.create_revision():
|
||||
user.save()
|
||||
reversion.set_user(request.user)
|
||||
reversion.set_comment("Champs modifié(s) : %s" % ', '.join(field for field in user.changed_data))
|
||||
reversion.set_comment("Champs modifié(s) : %s" % ', '.join(
|
||||
field for field in user.changed_data))
|
||||
messages.success(request, "L'user a bien été modifié")
|
||||
return redirect("/users/profil/" + userid)
|
||||
return form({'userform': user}, 'users/user.html', request)
|
||||
@ -121,7 +131,9 @@ def password(request, userid):
|
||||
messages.error(request, "Utilisateur inexistant")
|
||||
return redirect("/users/")
|
||||
if not request.user.has_perms(('bureau',)) and user != request.user:
|
||||
messages.error(request, "Vous ne pouvez pas modifier un autre user que vous sans droit admin")
|
||||
messages.error(request,
|
||||
"Vous ne pouvez pas modifier un autre user que vous "
|
||||
"sans droit admin")
|
||||
return redirect("/users/profil/" + str(request.user.id))
|
||||
u_form = PassForm(request.POST or None)
|
||||
if u_form.is_valid():
|
||||
@ -129,7 +141,8 @@ def password(request, userid):
|
||||
return form({'userform': u_form}, 'users/user.html', request)
|
||||
|
||||
|
||||
@user_is_in_campus
|
||||
@login_required
|
||||
@permission_required('perm')
|
||||
def index_clef(request):
|
||||
clef_list = Clef.objects.all().order_by('nom')
|
||||
return render(request, 'users/index_clef.html', {'clef_list': clef_list})
|
||||
@ -157,7 +170,8 @@ def index(request):
|
||||
@permission_required('perm')
|
||||
def index_ajour(request):
|
||||
""" Affiche l'ensemble des users, need droit admin """
|
||||
users_list = Adhesion.objects.all().order_by('annee_debut').reverse().first().adherent.all().order_by('first_name')
|
||||
users_list = Adhesion.objects.all().order_by(
|
||||
'annee_debut').reverse().first().adherent.all().order_by('first_name')
|
||||
paginator = Paginator(users_list, PAGINATION_NUMBER)
|
||||
page = request.GET.get('page')
|
||||
try:
|
||||
@ -171,58 +185,6 @@ def index_ajour(request):
|
||||
return render(request, 'users/index.html', {'users_list': users_list})
|
||||
|
||||
|
||||
@user_is_in_campus
|
||||
def history(request, object, id):
|
||||
""" Affichage de l'historique : (acl, argument)
|
||||
user : self, userid"""
|
||||
if object == 'clef':
|
||||
try:
|
||||
object_instance = Clef.objects.get(pk=id)
|
||||
except Clef.DoesNotExist:
|
||||
messages.error(request, "Utilisateur inexistant")
|
||||
return redirect("/users/")
|
||||
elif not request.user.is_authenticated:
|
||||
messages.error(request, "Permission denied")
|
||||
return redirect("/users/")
|
||||
if object == 'user':
|
||||
try:
|
||||
object_instance = User.objects.get(pk=id)
|
||||
except User.DoesNotExist:
|
||||
messages.error(request, "Utilisateur inexistant")
|
||||
return redirect("/users/")
|
||||
if not request.user.has_perms(('perm',)) and object_instance != request.user:
|
||||
messages.error(request,
|
||||
"Vous ne pouvez pas afficher l'historique d'un autre user que vous sans droit admin")
|
||||
return redirect("/users/profil/" + str(request.user.id))
|
||||
elif object == 'clef':
|
||||
try:
|
||||
object_instance = Clef.objects.get(pk=id)
|
||||
except Clef.DoesNotExist:
|
||||
messages.error(request, "Utilisateur inexistant")
|
||||
return redirect("/users/")
|
||||
elif object == 'adhesion':
|
||||
try:
|
||||
object_instance = Adhesion.objects.get(pk=id)
|
||||
except Adhesion.DoesNotExist:
|
||||
messages.error(request, "Utilisateur inexistant")
|
||||
return redirect("/users/")
|
||||
else:
|
||||
messages.error(request, "Objet inconnu")
|
||||
return redirect("/users/")
|
||||
reversions = Version.objects.get_for_object(object_instance)
|
||||
paginator = Paginator(reversions, PAGINATION_NUMBER)
|
||||
page = request.GET.get('page')
|
||||
try:
|
||||
reversions = paginator.page(page)
|
||||
except PageNotAnInteger:
|
||||
# If page is not an integer, deliver first page.
|
||||
reversions = paginator.page(1)
|
||||
except EmptyPage:
|
||||
# If page is out of range (e.g. 9999), deliver last page of results.
|
||||
reversions = paginator.page(paginator.num_pages)
|
||||
return render(request, 'med/history.html', {'reversions': reversions, 'object': object_instance})
|
||||
|
||||
|
||||
@login_required
|
||||
def mon_profil(request):
|
||||
return redirect("/users/profil/" + str(request.user.id))
|
||||
@ -236,7 +198,9 @@ def profil(request, userid):
|
||||
messages.error(request, "Utilisateur inexistant")
|
||||
return redirect("/users/")
|
||||
if not request.user.has_perms(('perm',)) and users != request.user:
|
||||
messages.error(request, "Vous ne pouvez pas afficher un autre user que vous sans droit perm")
|
||||
messages.error(request,
|
||||
"Vous ne pouvez pas afficher un autre user "
|
||||
"que vous sans droit perm")
|
||||
return redirect("/users/profil/" + str(request.user.id))
|
||||
emprunts_list = Emprunt.objects.filter(user=users)
|
||||
list_droits = Right.objects.filter(user=users)
|
||||
@ -259,11 +223,11 @@ def adherer(request, userid):
|
||||
except User.DoesNotExist:
|
||||
messages.error(request, "Utilisateur inexistant")
|
||||
return redirect("/users/")
|
||||
adh_annee = Adhesion.objects.all().order_by('annee_debut').reverse().first()
|
||||
adh_year = Adhesion.objects.all().order_by('annee_debut').reverse().first()
|
||||
with transaction.atomic(), reversion.create_revision():
|
||||
reversion.set_user(request.user)
|
||||
adh_annee.adherent.add(users)
|
||||
adh_annee.save()
|
||||
adh_year.adherent.add(users)
|
||||
adh_year.save()
|
||||
reversion.set_comment("Adhesion de %s" % users)
|
||||
messages.success(request, "Adhesion effectuee")
|
||||
return redirect("/users/profil/" + userid)
|
||||
|
||||
Reference in New Issue
Block a user