From cbc2a63c2a5fc07a39d5738e6fb73501c5cfd298 Mon Sep 17 00:00:00 2001
From: Gabriel Detraz <detraz@crans.org>
Date: Sun, 14 Oct 2018 20:17:51 +0200
Subject: [PATCH] Fix login next + display ap

---
 templates/registration/login.html               | 2 +-
 topologie/models.py                             | 4 ++++
 topologie/templates/topologie/aff_building.html | 2 ++
 topologie/views.py                              | 2 +-
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/templates/registration/login.html b/templates/registration/login.html
index c34c7582..6c62f013 100644
--- a/templates/registration/login.html
+++ b/templates/registration/login.html
@@ -29,7 +29,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 {% block title %}{% trans "Log in" %}{% endblock %}
 
 {% block content %}
-    <form method="post" action="{% url 'login' %}">
+    <form method="post" action="{% url 'login' %}?next={{ next }}">
         {% csrf_token %}
         {% bootstrap_form form %}
         <button class="btn btn-success" type="submit">
diff --git a/topologie/models.py b/topologie/models.py
index 65b253b9..79028378 100644
--- a/topologie/models.py
+++ b/topologie/models.py
@@ -468,6 +468,10 @@ class Building(AclMixin, RevMixin, models.Model):
         verbose_name = _("building")
         verbose_name_plural = _("buildings")
 
+    def all_ap_in(self):
+        """Returns all ap of the building"""
+        return AccessPoint.all_ap_in(self)
+
     def __str__(self):
         return self.name
 
diff --git a/topologie/templates/topologie/aff_building.html b/topologie/templates/topologie/aff_building.html
index 368887f5..51302d24 100644
--- a/topologie/templates/topologie/aff_building.html
+++ b/topologie/templates/topologie/aff_building.html
@@ -35,12 +35,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         <tr>
             {% trans "Building" as tr_building %}
             <th>{% include "buttons/sort.html" with prefix='building' col='name' text=tr_building %}</th>
+            <th>Wireless AP</th>
             <th></th>
         </tr>
     </thead>
     {% for building in building_list %}
     <tr>
         <td>{{ building.name }}</td>
+        <td>{% for ap in building.all_ap_in %} {{ ap.short_name }} {% endfor %}</td>
         <td class="text-right">
             {% can_edit building %}
             <a class="btn btn-primary btn-sm" role="button" title={% trans "Edit" %} href="{% url 'topologie:edit-building' building.id %}">
diff --git a/topologie/views.py b/topologie/views.py
index 77277ccf..0bd0f6c2 100644
--- a/topologie/views.py
+++ b/topologie/views.py
@@ -230,7 +230,7 @@ def index_ap(request):
                    queryset=(Interface.objects
                              .select_related('ipv4__ip_type__extension')
                              .select_related('domain__extension'))
-               )))
+               )).distinct())
     ap_list = SortTable.sort(
         ap_list,
         request.GET.get('col'),