From c029d2488b7f2dd52653a868cb801f84eaad2ccf Mon Sep 17 00:00:00 2001
From: Tim Hawes <me@timhawes.com>
Date: Sun, 26 Nov 2023 13:07:22 +0000
Subject: [PATCH] groupadmin: show names where available

---
 groupadmin/views.py                         | 14 +++++++++++---
 hackdb/templates/groupadmin/group_view.html | 14 +++++++-------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/groupadmin/views.py b/groupadmin/views.py
index d0bf079..02cdb60 100644
--- a/groupadmin/views.py
+++ b/groupadmin/views.py
@@ -44,7 +44,11 @@ def groupadmin_view(request, group_name):
 
     new_members = {}
     for user in get_user_model().objects.filter(is_active=True):
-        new_members[user.username] = user.id
+        new_members[user.username] = {
+            "id": user.id,
+            "username": user.username,
+            "full_name": user.get_full_name(),
+        }
     new_owners = new_members.copy()
 
     members = {}
@@ -56,6 +60,7 @@ def groupadmin_view(request, group_name):
         members[user.username] = {
             "id": user.id,
             "username": user.username,
+            "full_name": user.get_full_name(),
         }
 
     owners = {}
@@ -68,6 +73,7 @@ def groupadmin_view(request, group_name):
         owners[user.username] = {
             "id": user.id,
             "username": user.username,
+            "full_name": user.get_full_name(),
         }
 
     context = {
@@ -75,10 +81,12 @@ def groupadmin_view(request, group_name):
         "members": [members[username] for username in sorted(members.keys())],
         "owners": [owners[username] for username in sorted(owners.keys())],
         "new_members": [
-            (new_members[username], username) for username in sorted(new_members.keys())
+            (new_members[username]["id"], new_members[username])
+            for username in sorted(new_members.keys())
         ],
         "new_owners": [
-            (new_owners[username], username) for username in sorted(new_owners.keys())
+            (new_owners[username]["id"], new_owners[username])
+            for username in sorted(new_owners.keys())
         ],
     }
 
diff --git a/hackdb/templates/groupadmin/group_view.html b/hackdb/templates/groupadmin/group_view.html
index 49e1e55..eb8c5a4 100644
--- a/hackdb/templates/groupadmin/group_view.html
+++ b/hackdb/templates/groupadmin/group_view.html
@@ -16,7 +16,7 @@ <h1>Group {{ group.name }}</h1>
       <tbody>
       {% for user in members %}
       <tr>
-        <td>{{ user.username }}</td>
+        <td>{{ user.username }}{% if user.full_name %} ({{ user.full_name }}){% endif %}</td>
         <td>
           <form method="POST" action="{% url 'groupadmin_remove_member' group.name user.id %}">
             {% csrf_token %}
@@ -36,8 +36,8 @@ <h1>Group {{ group.name }}</h1>
         {% csrf_token %}
         <select name="user_id">
           <option value=""></option>
-          {% for user_id, user_name in new_members %}
-          <option value="{{ user_id }}">{{ user_name }}</option>
+          {% for user_id, user in new_members %}
+          <option value="{{ user_id }}">{{ user.username }}{% if user.full_name %} ({{ user.full_name }}){% endif %}</option>
           {% endfor %}
         </select>
         <button type="submit" class="btn btn-default">
@@ -62,9 +62,9 @@ <h1>Group {{ group.name }}</h1>
       <tbody>
       {% for user in owners %}
       <tr>
-        <td>{{ user.username }}</td>
+        <td>{{ user.username }}{% if user.full_name %} ({{ user.full_name }}){% endif %}</td>
         <td>
-          {% if user.username != request.user.username %}
+          {% if user.id != request.user.id %}
           <form method="POST" action="{% url 'groupadmin_remove_owner' group.name user.id %}">
             {% csrf_token %}
             <button type="submit" class="btn btn-xs btn-link">
@@ -84,8 +84,8 @@ <h1>Group {{ group.name }}</h1>
         {% csrf_token %}
         <select name="user_id">
           <option value=""></option>
-          {% for user_id, user_name in new_owners %}
-          <option value="{{ user_id }}">{{ user_name }}</option>
+          {% for user_id, user in new_owners %}
+          <option value="{{ user_id }}">{{ user.username }}{% if user.full_name %} ({{ user.full_name }}){% endif %}</option>
           {% endfor %}
         </select>
         <button type="submit" class="btn btn-default">Add Owner</button>