Fix : merge fait à l'arrache

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 %}

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')