From fac4da676913ee1eb9e20e638b572ca086837420 Mon Sep 17 00:00:00 2001
From: Aevann <randomname42029@gmail.com>
Date: Fri, 24 Feb 2023 21:53:40 +0200
Subject: [PATCH] order memberships better

---
 files/routes/groups.py                 | 8 +++++++-
 files/templates/group_memberships.html | 6 ++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/files/routes/groups.py b/files/routes/groups.py
index 27530c312..c292a47af 100644
--- a/files/routes/groups.py
+++ b/files/routes/groups.py
@@ -92,7 +92,13 @@ def leave_group(v:User, group_name):
 def memberships(v:User, group_name):
 	group = g.db.get(Group, group_name)
 	if not group: abort(404)
-	return render_template('group_memberships.html', v=v, group=group)
+
+	memberships = g.db.query(GroupMembership).filter_by(group_name=group_name).order_by(
+		GroupMembership.approved_utc.desc(),
+		GroupMembership.created_utc.desc(),
+		).all()
+
+	return render_template('group_memberships.html', v=v, group=group, memberships=memberships)
 
 @app.post("/!<group_name>/<user_id>/approve")
 @limiter.limit(DEFAULT_RATELIMIT_SLOWER, key_func=get_ID)
diff --git a/files/templates/group_memberships.html b/files/templates/group_memberships.html
index dbcd00ae5..b64b8ecf4 100644
--- a/files/templates/group_memberships.html
+++ b/files/templates/group_memberships.html
@@ -6,14 +6,14 @@
 <thead class="bg-primary text-white">
 	<tr>
 		<th>Name</th>
-		<th>Approevd on</th>
+		<th>Approved on</th>
 		{% if v.id == group.owner.id %}
 			<th></th>
 		{% endif %}
 	</tr>
 </thead>
 <tbody>
-{% for membership in group.memberships|reverse %}
+{% for membership in memberships %}
 	<tr>
 		<td>
 			{% with user=membership.user %}
@@ -28,6 +28,8 @@
 				<button type="button" class="btn btn-primary" data-nonce="{{g.nonce}}" data-onclick="approve_membership(this,'/!{{group}}/{{membership.user_id}}/approve')">Approve</button>
 				<button type="button" class="btn btn-primary" data-nonce="{{g.nonce}}" data-onclick="reject_membership(this,'/!{{group}}/{{membership.user_id}}/reject')">Reject</button>
 			</td>
+		{% else %}
+			<td></td>
 		{% endif %}
 		
 		{% if v.id == group.owner.id %}