rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-12-26 08:53:46 +00:00
Code Issues Releases Wiki Activity

Retour sur le profil de l'utilisateur apres suppression machine

Browse source 
Conflicts:
	machines/views.py
This commit is contained in:
Dalahro 2017-01-10 23:58:33 +01:00
parent 50921b01d8
commit db7c9a1b76
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
machines/views.py
View file

@ -127,6 +127,7 @@ def new_machine(request, userid):
reversion.set_user(request.user)
reversion.set_comment("Création")
messages.success(request, "La machine a été crée")
<<<<<<< HEAD
return redirect("/users/profil/" + userid)
=======
try:
@ -165,6 +166,9 @@ def new_machine(request, userid):
except TypeError:
messages.error(request, u"Adresse mac invalide")
>>>>>>> b660cf0... Prise en compte des erreurs sur la mac
=======
return redirect("/users/profil/" + user)
>>>>>>> 9b69205... Retour sur le profil de l'utilisateur apres suppression machine
return form({'machineform': machine, 'interfaceform': interface, 'domainform': domain}, 'machines/machine.html', request)
@login_required
@ -256,13 +260,13 @@ def del_machine(request, machineid):
if not request.user.has_perms(('cableur',)):
if machine.user != request.user:
messages.error(request, "Vous ne pouvez pas éditer une machine d'un autre user que vous sans droit")
return redirect("/users/profil/" + str(request.user.id))
return redirect("/users/profil/" + str(machine.user.id))
if request.method == "POST":
with transaction.atomic(), reversion.create_revision():
machine.delete()
reversion.set_user(request.user)
messages.success(request, "La machine a été détruite")
return redirect("/users/profil/" + str(request.user.id))
return redirect("/users/profil/" + str(machine.user.id))
return form({'objet': machine, 'objet_name': 'machine'}, 'machines/delete.html', request)
@login_required