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

Merge branch 'fix_nomage_machine' into 'master'

Browse source 
Fix nomage machine

See merge request federez/re2o!481
This commit is contained in:
Yoann Pétri 2020-01-25 12:32:08 +01:00
commit 9fdf6056ce
2 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
machines/forms.py
View file

@ -160,11 +160,6 @@ class DomainForm(FormRevMixin, FieldPermissionFormMixin, ModelForm):
fields = ["name", "ttl"] fields = ["name", "ttl"]
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
if "user" in kwargs:
user = kwargs["user"]
initial = kwargs.get("initial", {})
initial["name"] = user.get_next_domain_name()
kwargs["initial"] = initial
prefix = kwargs.pop("prefix", self.Meta.model.__name__) prefix = kwargs.pop("prefix", self.Meta.model.__name__)
super(DomainForm, self).__init__(*args, prefix=prefix, **kwargs) super(DomainForm, self).__init__(*args, prefix=prefix, **kwargs)

4
machines/views.py
View file

@ -228,7 +228,7 @@ def new_machine(request, user, **_kwargs):
machine = NewMachineForm(request.POST or None, user=request.user) machine = NewMachineForm(request.POST or None, user=request.user)
interface = AddInterfaceForm(request.POST or None, user=request.user) interface = AddInterfaceForm(request.POST or None, user=request.user)
domain = DomainForm(request.POST or None, user=user) domain = DomainForm(request.POST or None, user=user, initial={'name': user.get_next_domain_name()})
if machine.is_valid() and interface.is_valid(): if machine.is_valid() and interface.is_valid():
new_machine_obj = machine.save(commit=False) new_machine_obj = machine.save(commit=False)
new_machine_obj.user = user new_machine_obj.user = user
@ -325,7 +325,7 @@ def new_interface(request, machine, **_kwargs):
""" Ajoute une interface et son domain associé à une machine existante""" """ Ajoute une interface et son domain associé à une machine existante"""
interface_form = AddInterfaceForm(request.POST or None, user=request.user) interface_form = AddInterfaceForm(request.POST or None, user=request.user)
domain_form = DomainForm(request.POST or None, user=request.user) domain_form = DomainForm(request.POST or None, user=request.user, initial={'name': machine.user.get_next_domain_name()})
if interface_form.is_valid(): if interface_form.is_valid():
new_interface_obj = interface_form.save(commit=False) new_interface_obj = interface_form.save(commit=False)
domain_form.instance.interface_parent = new_interface_obj domain_form.instance.interface_parent = new_interface_obj