From 52fb4ea9f64aaffe5cc9d41430ee840378fa5600 Mon Sep 17 00:00:00 2001
From: Gabriel Detraz <detraz@crans.org>
Date: Tue, 3 Oct 2017 06:31:03 +0200
Subject: [PATCH] Ouverture de port avec warning si ipv4

---
 machines/templates/machines/aff_machines.html | 2 --
 machines/views.py                             | 3 +--
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/machines/templates/machines/aff_machines.html b/machines/templates/machines/aff_machines.html
index db3cdd37..3e26f64b 100644
--- a/machines/templates/machines/aff_machines.html
+++ b/machines/templates/machines/aff_machines.html
@@ -96,13 +96,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
                                 <i class="glyphicon glyphicon-edit"></i> Gerer les alias
                             </a>
                         </li>
-			{% if interface.may_have_port_open %}
 			<li>
 			    <a href="{% url 'machines:port-config' interface.id%}">
                                 <i class="glyphicon glyphicon-edit"></i> Gerer la configuration des ports
 			    </a>
 			</li>
-			{% endif %}
 			<li>
                             <a href="{% url 'machines:history' 'interface' interface.id %}">
                                 <i class="glyphicon glyphicon-time"></i> Historique
diff --git a/machines/views.py b/machines/views.py
index 4be86c03..76e10cfd 100644
--- a/machines/views.py
+++ b/machines/views.py
@@ -1002,8 +1002,7 @@ def configure_ports(request, pk):
         messages.error(request, u"Interface inexistante" )
         return redirect("/machines")
     if not interface_instance.may_have_port_open():
-        messages.error(request, "L'ip de cette interface n'est pas publique ou non assignée")
-        return redirect("/machines")
+        messages.error(request, "Attention, l'ipv4 n'est pas publique, l'ouverture n'aura pas d'effet en v4")
     interface = EditOuverturePortConfigForm(request.POST or None, instance=interface_instance)
     if interface.is_valid():
         interface.save()