From 01f3936ae12f3d613dd5b781a4994c6b722036b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Kervella?= Date: Sun, 15 Oct 2017 15:27:13 +0000 Subject: [PATCH] =?UTF-8?q?Fix=20:=20merge=20fait=20=C3=A0=20l'arrache?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- topologie/templates/topologie/switch.html | 2 +- topologie/views.py | 18 ++++-------------- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/topologie/templates/topologie/switch.html b/topologie/templates/topologie/switch.html index fe224678..249097e7 100644 --- a/topologie/templates/topologie/switch.html +++ b/topologie/templates/topologie/switch.html @@ -54,7 +54,7 @@ with this program; if not, write to the Free Software Foundation, Inc., {% endif %} {% if interfaceform %} {% 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 %} {% massive_bootstrap_form interfaceform 'ipv4,machine' %} {% endif %} diff --git a/topologie/views.py b/topologie/views.py index fb7550db..f1e8740c 100644 --- a/topologie/views.py +++ b/topologie/views.py @@ -381,20 +381,15 @@ def new_switch(request): reversion.set_comment("Création") messages.success(request, "Le switch a été créé") return redirect("/topologie/") -<<<<<<< HEAD - 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) + i_mbf_param = generate_ipv4_mbf_param( interface, False ) return form({ 'topoform': switch, 'machineform': machine, 'interfaceform': interface, 'domainform': domain, - 'i_bft_param': i_bft_param + 'i_mbf_param': i_mbf_param }, 'topologie/switch.html', request) ->>>>>>> master @login_required @permission_required('infra') @@ -454,20 +449,15 @@ def edit_switch(request, switch_id): ) messages.success(request, "Le switch a bien été modifié") return redirect("/topologie/") -<<<<<<< HEAD - 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) + i_mbf_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 + 'i_mbf_param': i_mbf_param }, 'topologie/switch.html', request) ->>>>>>> master @login_required @permission_required('infra')