rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-22 11:23:10 +00:00
Code Issues Releases Wiki Activity

Merge branch 'service_user_del' into 'master'

Browse source 
Fix del/edit serviceuser

See merge request federez/re2o!119
This commit is contained in:
moamoak 2018-04-10 19:50:48 +02:00
commit 5a6acb5941
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
users/views.py
View file

@ -275,12 +275,12 @@ def new_serviceuser(request):
@can_edit(ServiceUser)
def edit_serviceuser(request, serviceuser, serviceuserid):
""" Edit a ServiceUser """
user = EditServiceUserForm(request.POST or None, instance=user)
if user.is_valid():
user_object = user.save(commit=False)
if user.cleaned_data['password']:
user_object.set_password(user.cleaned_data['password'])
if user.changed_data:
serviceuser = EditServiceUserForm(request.POST or None, instance=serviceuser)
if serviceuser.is_valid():
user_object = serviceuser.save(commit=False)
if serviceuser.cleaned_data['password']:
user_object.set_password(serviceuser.cleaned_data['password'])
if serviceuser.changed_data:
user_object.save()
messages.success(request, "L'user a bien été modifié")
return redirect(reverse('users:index-serviceusers'))
@ -292,7 +292,7 @@ def edit_serviceuser(request, serviceuser, serviceuserid):
def del_serviceuser(request, serviceuser, serviceuserid):
"""Suppression d'un ou plusieurs serviceusers"""
if request.method == "POST":
user.delete()
serviceuser.delete()
messages.success(request, "L'user a été détruite")
return redirect(reverse('users:index-serviceusers'))
return form(