mirror of
https://gitlab2.federez.net/re2o/re2o
synced 2024-11-05 01:16:27 +00:00
Normalement ca gere les bugs d'ajout et verifie la validité du domaine
This commit is contained in:
parent
9b69205982
commit
9be0510f00
2 changed files with 34 additions and 27 deletions
|
@ -69,6 +69,7 @@ class AliasForm(ModelForm):
|
||||||
fields = ['name','extension']
|
fields = ['name','extension']
|
||||||
|
|
||||||
def __init__(self, *args, **kwargs):
|
def __init__(self, *args, **kwargs):
|
||||||
|
if 'infra' in kwargs:
|
||||||
infra = kwargs.pop('infra')
|
infra = kwargs.pop('infra')
|
||||||
if 'name_user' in kwargs:
|
if 'name_user' in kwargs:
|
||||||
name_user = kwargs.pop('name_user')
|
name_user = kwargs.pop('name_user')
|
||||||
|
|
|
@ -101,9 +101,13 @@ def new_machine(request, userid):
|
||||||
interface = AddInterfaceForm(request.POST or None, infra=request.user.has_perms(('infra',)))
|
interface = AddInterfaceForm(request.POST or None, infra=request.user.has_perms(('infra',)))
|
||||||
nb_machine = Interface.objects.filter(machine__user=userid).count()
|
nb_machine = Interface.objects.filter(machine__user=userid).count()
|
||||||
domain = AliasForm(request.POST or None, infra=request.user.has_perms(('infra',)), name_user=user.surname, nb_machine=nb_machine)
|
domain = AliasForm(request.POST or None, infra=request.user.has_perms(('infra',)), name_user=user.surname, nb_machine=nb_machine)
|
||||||
if machine.is_valid() and interface.is_valid():
|
try:
|
||||||
|
if machine.is_valid() and interface.is_valid() and domain.is_valid():
|
||||||
new_machine = machine.save(commit=False)
|
new_machine = machine.save(commit=False)
|
||||||
new_machine.user = user
|
new_machine.user = user
|
||||||
|
if len(interface.cleaned_data['mac_address']) != 12:
|
||||||
|
messages.error(request, u"Adresse mac trop courte")
|
||||||
|
return form({'machineform': machine, 'interfaceform': interface, 'domainform': domain}, 'machines/machine.html', request)
|
||||||
new_interface = interface.save(commit=False)
|
new_interface = interface.save(commit=False)
|
||||||
new_domain = domain.save(commit=False)
|
new_domain = domain.save(commit=False)
|
||||||
if full_domain_validator(request, new_domain):
|
if full_domain_validator(request, new_domain):
|
||||||
|
@ -126,7 +130,9 @@ def new_machine(request, userid):
|
||||||
reversion.set_user(request.user)
|
reversion.set_user(request.user)
|
||||||
reversion.set_comment("Création")
|
reversion.set_comment("Création")
|
||||||
messages.success(request, "La machine a été crée")
|
messages.success(request, "La machine a été crée")
|
||||||
return redirect("/users/profil/" + user)
|
return redirect("/users/profil/" + str(user.id))
|
||||||
|
except TypeError:
|
||||||
|
messages.error(request, u"Adresse mac invalide")
|
||||||
return form({'machineform': machine, 'interfaceform': interface, 'domainform': domain}, 'machines/machine.html', request)
|
return form({'machineform': machine, 'interfaceform': interface, 'domainform': domain}, 'machines/machine.html', request)
|
||||||
|
|
||||||
@login_required
|
@login_required
|
||||||
|
|
Loading…
Reference in a new issue