From e924e9196470e8ab43e7692b0add5cd8c01e7974 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ma=C3=ABl=20Kervella?= <kervella.mael@gmail.com>
Date: Tue, 10 Apr 2018 11:56:17 +0000
Subject: [PATCH] Move Building and SwitchBay infos on the Stack info page

---
 .../topologie/index_model_switch.html         | 44 ++++++--------
 .../templates/topologie/index_stack.html      | 31 +++++++---
 topologie/views.py                            | 58 ++++++++++---------
 3 files changed, 71 insertions(+), 62 deletions(-)

diff --git a/topologie/templates/topologie/index_model_switch.html b/topologie/templates/topologie/index_model_switch.html
index 19752b2a..7c1a15f8 100644
--- a/topologie/templates/topologie/index_model_switch.html
+++ b/topologie/templates/topologie/index_model_switch.html
@@ -29,31 +29,21 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 {% block title %}Modèles de switches{% endblock %}
 
 {% block content %}
-<h2>Modèles de switches</h2>
-{% can_create ModelSwitch %}
-<a class="btn btn-primary btn-sm" role="button" href="{% url 'topologie:new-model-switch' %}"><i class="fa fa-plus"></i> Ajouter un modèle</a>
-<hr>
-{% acl_end %}
-{% include "topologie/aff_model_switch.html" with model_switch_list=model_switch_list %}
-<h2>Constructeurs de switches</h2>
-{% can_create ConstructorSwitch %}
-<a class="btn btn-primary btn-sm" role="button" href="{% url 'topologie:new-constructor-switch' %}"><i class="fa fa-plus"></i> Ajouter un constructeur</a>
-<hr>
-{% acl_end %}
-{% include "topologie/aff_constructor_switch.html" with constructor_switch_list=constructor_switch_list %}
-<h2>Baie de brassage</h2>
-{% can_create SwitchBay %}
-<a class="btn btn-primary btn-sm" role="button" href="{% url 'topologie:new-switch-bay' %}"><i class="fa fa-plus"></i> Ajouter une baie de brassage</a>
-<hr>
-{% acl_end %}
-{% include "topologie/aff_switch_bay.html" with switch_bay_list=switch_bay_list %}
-<h2>Batiment</h2>
-{% can_create Building %}
-<a class="btn btn-primary btn-sm" role="button" href="{% url 'topologie:new-building' %}"><i class="fa fa-plus"></i> Ajouter un bâtiment</a>
-<hr>
-{% acl_end %}
-{% include "topologie/aff_building.html" with building_list=building_list %}
-    <br />
-    <br />
-    <br />
+    <h2>Modèles de switches</h2>
+    {% can_create ModelSwitch %}
+    <a class="btn btn-primary btn-sm" role="button" href="{% url 'topologie:new-model-switch' %}">
+        <i class="fa fa-plus"></i> Ajouter un modèle
+    </a>
+    <hr>
+    {% acl_end %}
+    {% include "topologie/aff_model_switch.html" with model_switch_list=model_switch_list %}
+
+    <h2>Constructeurs de switches</h2>
+    {% can_create ConstructorSwitch %}
+    <a class="btn btn-primary btn-sm" role="button" href="{% url 'topologie:new-constructor-switch' %}">
+        <i class="fa fa-plus"></i> Ajouter un constructeur
+    </a>
+    <hr>
+    {% acl_end %}
+    {% include "topologie/aff_constructor_switch.html" with constructor_switch_list=constructor_switch_list %}
 {% endblock %}
diff --git a/topologie/templates/topologie/index_stack.html b/topologie/templates/topologie/index_stack.html
index 1ba49b5a..2470c019 100644
--- a/topologie/templates/topologie/index_stack.html
+++ b/topologie/templates/topologie/index_stack.html
@@ -29,12 +29,29 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 {% block title %}Stacks{% endblock %}
 
 {% block content %}
-  <h2>Stacks</h2>
-{% can_create Stack %}
-<a class="btn btn-primary btn-sm" role="button" href="{% url 'topologie:new-stack' %}"><i class="fa fa-plus"></i> Ajouter une stack</a>
-{% acl_end %}
+    <h2>Stacks</h2>
+    {% can_create Stack %}
+    <a class="btn btn-primary btn-sm" role="button" href="{% url 'topologie:new-stack' %}">
+        <i class="fa fa-plus"></i> Ajouter une stack
+    </a>
+    {% acl_end %}
     {% include "topologie/aff_stacks.html" with stack_list=stack_list %}
-    <br />
-    <br />
-    <br />
+    
+    <h2>Baie de brassage</h2>
+    {% can_create SwitchBay %}
+    <a class="btn btn-primary btn-sm" role="button" href="{% url 'topologie:new-switch-bay' %}">
+        <i class="fa fa-plus"></i> Ajouter une baie de brassage
+    </a>
+    <hr>
+    {% acl_end %}
+    {% include "topologie/aff_switch_bay.html" with switch_bay_list=switch_bay_list %}
+    
+    <h2>Batiment</h2>
+    {% can_create Building %}
+    <a class="btn btn-primary btn-sm" role="button" href="{% url 'topologie:new-building' %}">
+        <i class="fa fa-plus"></i> Ajouter un bâtiment
+    </a>
+    <hr>
+    {% acl_end %}
+    {% include "topologie/aff_building.html" with building_list=building_list %}
 {% endblock %}
diff --git a/topologie/views.py b/topologie/views.py
index 51c00aa8..3a215c07 100644
--- a/topologie/views.py
+++ b/topologie/views.py
@@ -182,42 +182,20 @@ def index_ap(request):
 
 @login_required
 @can_view_all(Stack)
+@can_view_all(Building)
+@can_view_all(SwitchBay)
 def index_stack(request):
     """Affichage de la liste des stacks (affiche l'ensemble des switches)"""
     stack_list = Stack.objects\
         .prefetch_related('switch_set__interface_set__domain__extension')
+    building_list = Building.objects.all()
+    switch_bay_list = SwitchBay.objects.select_related('building')
     stack_list = SortTable.sort(
         stack_list,
         request.GET.get('col'),
         request.GET.get('order'),
         SortTable.TOPOLOGIE_INDEX_STACK
     )
-    return render(request, 'topologie/index_stack.html', {
-        'stack_list': stack_list
-        })
-
-
-@login_required
-@can_view_all(ModelSwitch)
-@can_view_all(ConstructorSwitch)
-def index_model_switch(request):
-    """ Affichage de l'ensemble des modèles de switches"""
-    model_switch_list = ModelSwitch.objects.select_related('constructor')
-    constructor_switch_list = ConstructorSwitch.objects
-    switch_bay_list = SwitchBay.objects.select_related('building')
-    building_list = Building.objects.all()
-    model_switch_list = SortTable.sort(
-        model_switch_list,
-        request.GET.get('col'),
-        request.GET.get('order'),
-        SortTable.TOPOLOGIE_INDEX_MODEL_SWITCH
-    )
-    constructor_switch_list = SortTable.sort(
-        constructor_switch_list,
-        request.GET.get('col'),
-        request.GET.get('order'),
-        SortTable.TOPOLOGIE_INDEX_CONSTRUCTOR_SWITCH
-    )
     building_list = SortTable.sort(
         building_list,
         request.GET.get('col'),
@@ -230,11 +208,35 @@ def index_model_switch(request):
         request.GET.get('order'),
         SortTable.TOPOLOGIE_INDEX_SWITCH_BAY
     )
+    return render(request, 'topologie/index_stack.html', {
+        'stack_list': stack_list,
+        'switch_bay_list': switch_bay_list,
+        'building_list' : building_list,
+        })
+
+
+@login_required
+@can_view_all(ModelSwitch)
+@can_view_all(ConstructorSwitch)
+def index_model_switch(request):
+    """ Affichage de l'ensemble des modèles de switches"""
+    model_switch_list = ModelSwitch.objects.select_related('constructor')
+    constructor_switch_list = ConstructorSwitch.objects
+    model_switch_list = SortTable.sort(
+        model_switch_list,
+        request.GET.get('col'),
+        request.GET.get('order'),
+        SortTable.TOPOLOGIE_INDEX_MODEL_SWITCH
+    )
+    constructor_switch_list = SortTable.sort(
+        constructor_switch_list,
+        request.GET.get('col'),
+        request.GET.get('order'),
+        SortTable.TOPOLOGIE_INDEX_CONSTRUCTOR_SWITCH
+    )
     return render(request, 'topologie/index_model_switch.html', {
         'model_switch_list': model_switch_list,
         'constructor_switch_list': constructor_switch_list,
-        'switch_bay_list': switch_bay_list,
-        'building_list' : building_list,
         })