From 1c41c8a1aa07d7a716561c7594f769db7aa58cf5 Mon Sep 17 00:00:00 2001
From: scragly <29337040+scragly@users.noreply.github.com>
Date: Sun, 20 Oct 2019 06:33:35 +1000
Subject: Improve nominations admin list and page, add search and filter by
 active.

---
 pydis_site/apps/api/admin.py                 | 39 +++++++++++++++++++++++++++-
 pydis_site/apps/api/models/bot/nomination.py |  5 ++++
 2 files changed, 43 insertions(+), 1 deletion(-)

(limited to 'pydis_site/apps/api')

diff --git a/pydis_site/apps/api/admin.py b/pydis_site/apps/api/admin.py
index 74b9413b..55a9d655 100644
--- a/pydis_site/apps/api/admin.py
+++ b/pydis_site/apps/api/admin.py
@@ -166,6 +166,43 @@ class InfractionAdmin(admin.ModelAdmin):
     )
 
 
+class NominationAdmin(admin.ModelAdmin):
+    """Admin formatting for the Nomination model."""
+
+    list_display = (
+        "user",
+        "active",
+        "reason",
+        "actor",
+        "inserted_at",
+        "ended_at"
+    )
+    fields = (
+        "user",
+        "active",
+        "actor",
+        "reason",
+        "inserted_at",
+        "ended_at",
+        "end_reason"
+    )
+    readonly_fields = (
+        "user",
+        "active",
+        "actor",
+        "inserted_at",
+        "ended_at"
+    )
+    search_fields = (
+        "actor__name",
+        "actor__id",
+        "user__name",
+        "user__id",
+        "reason"
+    )
+    list_filter = ("active",)
+
+
 class StaffRolesFilter(admin.SimpleListFilter):
     """Filter options for Staff Roles."""
 
@@ -212,7 +249,7 @@ admin.site.register(DocumentationLink)
 admin.site.register(Infraction, InfractionAdmin)
 admin.site.register(LogEntry, LogEntryAdmin)
 admin.site.register(MessageDeletionContext, MessageDeletionContextAdmin)
-admin.site.register(Nomination)
+admin.site.register(Nomination, NominationAdmin)
 admin.site.register(OffTopicChannelName)
 admin.site.register(Role)
 admin.site.register(Tag)
diff --git a/pydis_site/apps/api/models/bot/nomination.py b/pydis_site/apps/api/models/bot/nomination.py
index cd9951aa..a0ba42a3 100644
--- a/pydis_site/apps/api/models/bot/nomination.py
+++ b/pydis_site/apps/api/models/bot/nomination.py
@@ -44,3 +44,8 @@ class Nomination(ModelReprMixin, models.Model):
         """Representation that makes the target and state of the nomination immediately evident."""
         status = "active" if self.active else "ended"
         return f"Nomination of {self.user} ({status})"
+
+    class Meta:
+        """Set the ordering of nominations to most recent first."""
+
+        ordering = ("-inserted_at",)
-- 
cgit v1.2.3