From cc50d540c34e447bbf315d454eea5ad0c961f352 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20P=C3=A9pin?= <kerl@wkerl.me>
Date: Wed, 6 Jan 2021 20:17:25 +0100
Subject: [PATCH 1/2] Display the list of groups at /_groups/

---
 .../templates/wiki_groups/{graph.html => list.html}    | 10 ++++++++++
 wiki_groups/urls.py                                    |  2 +-
 wiki_groups/views.py                                   | 10 +++++++++-
 3 files changed, 20 insertions(+), 2 deletions(-)
 rename wiki_groups/templates/wiki_groups/{graph.html => list.html} (87%)

diff --git a/wiki_groups/templates/wiki_groups/graph.html b/wiki_groups/templates/wiki_groups/list.html
similarity index 87%
rename from wiki_groups/templates/wiki_groups/graph.html
rename to wiki_groups/templates/wiki_groups/list.html
index f2cfea7..b20c4e8 100644
--- a/wiki_groups/templates/wiki_groups/graph.html
+++ b/wiki_groups/templates/wiki_groups/list.html
@@ -4,6 +4,16 @@
 {% block wiki_site_title %}Groupes - WikiENS{% endblock %}
 
 {% block wiki_contents %}
+  <h2>Liste des groupes du wiki</h2>
+
+  <hr />
+
+  <ul>
+    {% for id, name in groups %}
+      <li>{{name}}</li>
+    {% endfor %}
+  </ul>
+
   <h2>Graphe des groupes du wiki</h2>
 
   <hr />
diff --git a/wiki_groups/urls.py b/wiki_groups/urls.py
index b9c4f44..8414869 100644
--- a/wiki_groups/urls.py
+++ b/wiki_groups/urls.py
@@ -4,8 +4,8 @@ from wiki_groups import views
 
 app_name = "wiki_groups"
 urlpatterns = [
+    path("", views.GroupList.as_view(), name="list"),
     path("dot_graph", views.dot_graph, name="dot_graph"),
-    path("graph", views.graph, name="graph"),
     path("managed", views.ManagedGroupsView.as_view(), name="managed-groups"),
     path("<int:pk>", views.WikiGroupView.as_view(), name="admin-group"),
     path(
diff --git a/wiki_groups/views.py b/wiki_groups/views.py
index f580963..bba5db7 100644
--- a/wiki_groups/views.py
+++ b/wiki_groups/views.py
@@ -30,7 +30,15 @@ def dot_graph(request):
     return response
 
 
-graph = TemplateView.as_view(template_name="wiki_groups/graph.html")
+class GroupList(ListView):
+    template_name = "wiki_groups/list.html"
+    model = WikiGroup
+    context_object_name = "groups"
+
+    def get_queryset(self):
+        return WikiGroup.objects.values_list("id", "django_group__name").order_by(
+            "django_group__name"
+        )
 
 
 class WikiGroupMixin(SingleObjectMixin, UserPassesTestMixin):

From 29c5abbc1af6e433f4345da51f22c4b277f601d0 Mon Sep 17 00:00:00 2001
From: Tom Hubrecht <tom.hubrecht@ens.fr>
Date: Tue, 26 Oct 2021 20:01:58 +0200
Subject: [PATCH 2/2] On affiche la liste des managers

---
 wiki_groups/templates/wiki_groups/list.html | 67 +++++++++++----------
 wiki_groups/views.py                        |  5 +-
 2 files changed, 38 insertions(+), 34 deletions(-)

diff --git a/wiki_groups/templates/wiki_groups/list.html b/wiki_groups/templates/wiki_groups/list.html
index b20c4e8..ecf293e 100644
--- a/wiki_groups/templates/wiki_groups/list.html
+++ b/wiki_groups/templates/wiki_groups/list.html
@@ -4,44 +4,49 @@
 {% block wiki_site_title %}Groupes - WikiENS{% endblock %}
 
 {% block wiki_contents %}
-  <h2>Liste des groupes du wiki</h2>
+<h2>
+  Liste des groupes du wiki
+  {% if request.user.is_staff or request.user.managed_groups.exists %}
+  <a class="btn btn-primary float-right" href="{% url 'wiki_groups:managed-groups' %}">
+    Liste des groupes gérés
+  </a>
+  {% endif %}
+</h2>
+<hr>
 
-  <hr />
+<ul>
+  {% for group in wikigroup_list %}
+  <li>{{ group.django_group.name }} {% if group.managers.exists %}(Géré par {% for m in group.managers.all %}{{ m }}{% if not forloop.last %}, {% endif %}{% endfor %}){% endif %}</li>
+  {% endfor %}
+</ul>
 
-  <ul>
-    {% for id, name in groups %}
-      <li>{{name}}</li>
-    {% endfor %}
-  </ul>
+<h2>Graphe des groupes du wiki</h2>
+<hr>
 
-  <h2>Graphe des groupes du wiki</h2>
+<div id="svg-graph"></div>
+<hr>
 
-  <hr />
+<p>
+  Les flèches représentent l'inclusion : <code>A -&gt; B</code> signifie que
+  le groupe <code>A</code> est contenu dans le groupe <code>B</code>.
+</p>
 
-  <div id="svg-graph"></div>
+<script src="{% static 'wiki_groups/js/vendor/viz.js' %}"></script>
+<script src="{% static 'wiki_groups/js/vendor/lite.render.js' %}"></script>
+<script>
+  var viz = new Viz();
 
-  <hr />
-
-  <p>
-    Les flèches représentent l'inclusion : <code>A -&gt; B</code> signifie que
-    le groupe <code>A</code> est contenu dans le groupe <code>B</code>.
-  </p>
-
-  <script src="{% static 'wiki_groups/js/vendor/viz.js' %}"></script>
-  <script src="{% static 'wiki_groups/js/vendor/lite.render.js' %}"></script>
-  <script>
-    var viz = new Viz();
-    
-    var xhttp = new XMLHttpRequest();
-    xhttp.onreadystatechange = function() {
-      if (this.readyState == 4 && this.status == 200) {
-        viz.renderSVGElement(this.responseText)
+  var xhttp = new XMLHttpRequest();
+  xhttp.onreadystatechange = function() {
+    if (this.readyState == 4 && this.status == 200) {
+      viz.renderSVGElement(this.responseText)
         .then(element => {
           document.getElementById("svg-graph").appendChild(element);
         })
-      }
-    };
-    xhttp.open("GET", "{% url 'wiki_groups:dot_graph' %}", true);
-    xhttp.send();
-  </script>
+    }
+  };
+  xhttp.open('GET', '{% url 'wiki_groups:dot_graph' %}', true);
+  xhttp.send();
+
+</script>
 {% endblock %}
diff --git a/wiki_groups/views.py b/wiki_groups/views.py
index bba5db7..db751b9 100644
--- a/wiki_groups/views.py
+++ b/wiki_groups/views.py
@@ -2,7 +2,7 @@ from django.contrib.auth import get_user_model
 from django.contrib.auth.mixins import LoginRequiredMixin, UserPassesTestMixin
 from django.http import HttpResponse, HttpResponseRedirect
 from django.urls import reverse, reverse_lazy
-from django.views.generic import DetailView, ListView, RedirectView, TemplateView
+from django.views.generic import DetailView, ListView, RedirectView
 from django.views.generic.detail import SingleObjectMixin
 from django.views.generic.edit import BaseFormView
 
@@ -33,10 +33,9 @@ def dot_graph(request):
 class GroupList(ListView):
     template_name = "wiki_groups/list.html"
     model = WikiGroup
-    context_object_name = "groups"
 
     def get_queryset(self):
-        return WikiGroup.objects.values_list("id", "django_group__name").order_by(
+        return WikiGroup.objects.select_related("django_group").order_by(
             "django_group__name"
         )