Commit 060dcc92 authored by Dalahro's avatar Dalahro

Retour sur le profil de l'utilisateur apres suppression machine

Conflicts:
	machines/views.py
parent 605e3933
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment