From 7feba7fa4cf8a50a4490687e5bb0e55453b1e4dc Mon Sep 17 00:00:00 2001
From: chirac <chirac@raspberrypi>
Date: Wed, 27 Jun 2018 20:28:54 +0000
Subject: [PATCH] =?UTF-8?q?Menu=20s=C3=A9par=C3=A9=20pour=20les=20profils?=
 =?UTF-8?q?=20de=20ports?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 topologie/templates/topologie/index.html      | 10 -----
 .../topologie/index_portprofile.html          | 44 +++++++++++++++++++
 topologie/templates/topologie/sidebar.html    |  6 ++-
 topologie/urls.py                             |  3 ++
 topologie/views.py                            | 17 +++++--
 5 files changed, 66 insertions(+), 14 deletions(-)
 create mode 100644 topologie/templates/topologie/index_portprofile.html

diff --git a/topologie/templates/topologie/index.html b/topologie/templates/topologie/index.html
index 7902f4a3..7949f412 100644
--- a/topologie/templates/topologie/index.html
+++ b/topologie/templates/topologie/index.html
@@ -73,14 +73,4 @@ Topologie des Switchs
     <br />
     <br />
 
-<h2>{% trans "Port profiles" %}</h2>
-{% can_create PortProfile %}
-<a class="btn btn-primary btn-sm" role="button" href="{% url 'topologie:new-port-profile' %}"><i class="fa fa-plus"></i>{% trans " Add a port profile" %}</a>
-<hr>
-{% acl_end %}
-    {% include "topologie/aff_port_profile.html" with port_profile_list=port_profile_list %}
-    <br />
-    <br />
-    <br />
-
 {% endblock %}
diff --git a/topologie/templates/topologie/index_portprofile.html b/topologie/templates/topologie/index_portprofile.html
new file mode 100644
index 00000000..a4287da6
--- /dev/null
+++ b/topologie/templates/topologie/index_portprofile.html
@@ -0,0 +1,44 @@
+{% extends "topologie/sidebar.html" %}
+{% comment %}
+Re2o est un logiciel d'administration développé initiallement au rezometz. Il
+se veut agnostique au réseau considéré, de manière à être installable en
+quelques clics.
+
+Copyright © 2017  Gabriel Détraz
+Copyright © 2017  Goulven Kermarec
+Copyright © 2017  Augustin Lemesle
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+{% endcomment %}
+
+{% load bootstrap3 %}
+{% load acl %}
+{% load i18n %}
+
+{% block title %}Switchs{% endblock %}
+
+{% block content %}
+
+<h2>{% trans "Port profiles" %}</h2>
+{% can_create PortProfile %}
+<a class="btn btn-primary btn-sm" role="button" href="{% url 'topologie:new-port-profile' %}"><i class="fa fa-plus"></i>{% trans " Add a port profile" %}</a>
+<hr>
+{% acl_end %}
+    {% include "topologie/aff_port_profile.html" with port_profile_list=port_profile_list %}
+    <br />
+    <br />
+    <br />
+
+{% endblock %}
diff --git a/topologie/templates/topologie/sidebar.html b/topologie/templates/topologie/sidebar.html
index ce7b4114..c7ea6337 100644
--- a/topologie/templates/topologie/sidebar.html
+++ b/topologie/templates/topologie/sidebar.html
@@ -33,7 +33,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         <i class="fa fa-microchip"></i>
         Switchs
     </a>
-     <a class="list-group-item list-group-item-info" href="{% url "topologie:index-ap" %}">
+     <a class="list-group-item list-group-item-info" href="{% url "topologie:index-port-profile" %}">
+        <i class="fa fa-sliders"></i>
+        Profil des ports switchs
+    </a>
+    <a class="list-group-item list-group-item-info" href="{% url "topologie:index-ap" %}">
         <i class="fa fa-wifi"></i>
         Bornes WiFi
     </a>
diff --git a/topologie/urls.py b/topologie/urls.py
index be122191..c314c800 100644
--- a/topologie/urls.py
+++ b/topologie/urls.py
@@ -108,6 +108,9 @@ urlpatterns = [
     url(r'^del_building/(?P<buildingid>[0-9]+)$',
         views.del_building,
         name='del-building'),
+    url(r'^index_port_profile/$',
+        views.index_port_profile,
+        name='index-port-profile'),
     url(r'^new_port_profile/$',
         views.new_port_profile,
         name='new-port-profile'),
diff --git a/topologie/views.py b/topologie/views.py
index 4b21c651..b7761e0c 100644
--- a/topologie/views.py
+++ b/topologie/views.py
@@ -128,11 +128,9 @@ def index(request):
         SortTable.TOPOLOGIE_INDEX
     )
 
-    port_profile_list = PortProfile.objects.all()
 
     pagination_number = GeneralOption.get_cached_value('pagination_number')
     switch_list = re2o_paginator(request, switch_list, pagination_number)
-    port_profile_list = re2o_paginator(request, port_profile_list, pagination_number)
 
     if any(service_link.need_regen for service_link in Service_link.objects.filter(service__service_type='graph_topo')):
         make_machine_graph()
@@ -144,7 +142,20 @@ def index(request):
     return render(
         request,
         'topologie/index.html',
-        {'switch_list': switch_list, 'port_profile_list': port_profile_list}
+        {'switch_list': switch_list}
+    )
+
+
+@login_required
+@can_view_all(PortProfile)
+def index_port_profile(request):
+    pagination_number = GeneralOption.get_cached_value('pagination_number')
+    port_profile_list = PortProfile.objects.all().select_related('vlan_untagged')
+    port_profile_list = re2o_paginator(request, port_profile_list, pagination_number)
+    return render(
+        request,
+        'topologie/index_portprofile.html',
+        {'port_profile_list': port_profile_list}
     )