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

Fix : merge fait à l'arrache

Browse source
This commit is contained in:
Maël Kervella 2017-10-15 15:27:13 +00:00
parent 2640aea601
commit 01f3936ae1
2 changed files with 5 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
topologie/templates/topologie/switch.html
View file

@ -54,7 +54,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% endif %} {% endif %}
{% if interfaceform %} {% if interfaceform %}
{% if i_bft_param %} {% if i_bft_param %}
{% massive_bootstrap_form interfaceform 'ipv4,machine' mbf_param=i_bft_param %} {% massive_bootstrap_form interfaceform 'ipv4,machine' mbf_param=i_mbf_param %}
{% else %} {% else %}
{% massive_bootstrap_form interfaceform 'ipv4,machine' %} {% massive_bootstrap_form interfaceform 'ipv4,machine' %}
{% endif %} {% endif %}

18
topologie/views.py
View file

@ -381,20 +381,15 @@ def new_switch(request):
reversion.set_comment("Création") reversion.set_comment("Création")
messages.success(request, "Le switch a été créé") messages.success(request, "Le switch a été créé")
return redirect("/topologie/") return redirect("/topologie/")
<<<<<<< HEAD i_mbf_param = generate_ipv4_mbf_param( interface, False )
i_bft_param = generate_ipv4_mbf_param( interface, False )
return form({'topoform':switch, 'machineform': machine, 'interfaceform': interface, 'domainform': domain, 'i_bft_param': i_bft_param}, 'topologie/switch.html', request)
=======
i_bft_param = generate_ipv4_bft_param(interface, False)
return form({ return form({
'topoform': switch, 'topoform': switch,
'machineform': machine, 'machineform': machine,
'interfaceform': interface, 'interfaceform': interface,
'domainform': domain, 'domainform': domain,
'i_bft_param': i_bft_param 'i_mbf_param': i_mbf_param
}, 'topologie/switch.html', request) }, 'topologie/switch.html', request)
>>>>>>> master
@login_required @login_required
@permission_required('infra') @permission_required('infra')
@ -454,20 +449,15 @@ def edit_switch(request, switch_id):
) )
messages.success(request, "Le switch a bien été modifié") messages.success(request, "Le switch a bien été modifié")
return redirect("/topologie/") return redirect("/topologie/")
<<<<<<< HEAD i_mbf_param = generate_ipv4_mbf_param( interface_form, False )
i_bft_param = generate_ipv4_mbf_param( interface_form, False )
return form({'topoform':switch_form, 'machineform': machine_form, 'interfaceform': interface_form, 'domainform': domain_form, 'i_bft_param': i_bft_param}, 'topologie/switch.html', request)
=======
i_bft_param = generate_ipv4_bft_param(interface_form, False)
return form({ return form({
'topoform': switch_form, 'topoform': switch_form,
'machineform': machine_form, 'machineform': machine_form,
'interfaceform': interface_form, 'interfaceform': interface_form,
'domainform': domain_form, 'domainform': domain_form,
'i_bft_param': i_bft_param 'i_mbf_param': i_mbf_param
}, 'topologie/switch.html', request) }, 'topologie/switch.html', request)
>>>>>>> master
@login_required @login_required
@permission_required('infra') @permission_required('infra')