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

Bug réglé autocomplétion

Browse source
This commit is contained in:
Dalahro 2017-01-09 16:20:13 +01:00 committed by root
parent 7cf2e52541
commit b7a665df9f
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
machines/forms.py
View file

@ -70,11 +70,12 @@ class AliasForm(ModelForm):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
infra = kwargs.pop('infra') infra = kwargs.pop('infra')
name_user = kwargs.pop('name_user') if 'name_user' in kwargs:
nb_machine = kwargs.pop('nb_machine') name_user = kwargs.pop('name_user')
initial = kwargs.get('initial', {}) nb_machine = kwargs.pop('nb_machine')
initial['name'] = name_user.lower()+str(nb_machine) initial = kwargs.get('initial', {})
kwargs['initial'] = initial initial['name'] = name_user.lower()+str(nb_machine)
kwargs['initial'] = initial
super(AliasForm, self).__init__(*args, **kwargs) super(AliasForm, self).__init__(*args, **kwargs)
if not infra: if not infra:
self.fields['extension'].queryset = Extension.objects.filter(need_infra=False) self.fields['extension'].queryset = Extension.objects.filter(need_infra=False)

2
machines/views.py
View file

@ -100,7 +100,7 @@ def new_machine(request, userid):
machine = NewMachineForm(request.POST or None) machine = NewMachineForm(request.POST or None)
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=request.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(): if machine.is_valid() and interface.is_valid():
new_machine = machine.save(commit=False) new_machine = machine.save(commit=False)
new_machine.user = user new_machine.user = user