Update Role ModelAdmin to past changes, cleanup formatting.

2 files changed, 31 insertions, 17 deletions

diff --git a/pydis_site/apps/api/admin.py b/pydis_site/apps/api/admin.py
index 15a1ec78..d32b4911 100644
--- a/pydis_site/apps/api/admin.py
+++ b/pydis_site/apps/api/admin.py
@@ -222,34 +222,47 @@ class OffTopicChannelNameAdmin(admin.ModelAdmin):
 class RoleAdmin(admin.ModelAdmin):
     """Admin formatting for the Role model."""
 
-    exclude = ("permissions", "colour")
-    readonly_fields = (
-        "name",
-        "id",
-        "colour_with_preview",
-        "permissions_with_calc_link",
-        "position"
-    )
-    search_fields = ("name", "id")
+    def coloured_name(self, role: Role) -> SafeString:
+        """Role name with html style colouring."""
+        return format_html(
+            '<span style="color: {0}!important; font-weight: bold;">{1}</span>',
+            f"#{role.colour:06X}",
+            role.name
+        )
+
+    coloured_name.short_description = "Name"
 
-    def colour_with_preview(self, instance: Role) -> str:
+    def colour_with_preview(self, role: Role) -> SafeString:
         """Show colour value in both int and hex, in bolded and coloured style."""
         return format_html(
-            "<span style='color: #{0}!important; font-weight: bold;'>{1} / #{0}</span>",
-            f"{instance.colour:06x}",
-            instance.colour
+            "<span style='color: {0}; font-weight: bold;'>{0} ({1})</span>",
+            f"#{role.colour:06x}",
+            role.colour
         )
 
-    def permissions_with_calc_link(self, instance: Role) -> str:
+    colour_with_preview.short_description = "Colour"
+
+    def permissions_with_calc_link(self, role: Role) -> SafeString:
         """Show permissions with link to API permissions calculator page."""
         return format_html(
             "<a href='https://discordapi.com/permissions.html#{0}' target='_blank'>{0}</a>",
-            instance.permissions
+            role.permissions
         )
 
-    colour_with_preview.short_description = "Colour"
     permissions_with_calc_link.short_description = "Permissions"
 
+    search_fields = ("name", "id")
+    list_display = ("coloured_name",)
+    fields = ("id", "name", "colour_with_preview", "permissions_with_calc_link", "position")
+
+    def has_add_permission(self, *args) -> bool:
+        """Prevent adding from django admin."""
+        return False
+
+    def has_change_permission(self, *args) -> bool:
+        """Prevent editing from django admin."""
+        return False
+
 
 class UserTopRoleFilter(admin.SimpleListFilter):
     """List Filter for User list Admin page."""
diff --git a/pydis_site/apps/api/models/bot/role.py b/pydis_site/apps/api/models/bot/role.py
index b23fc5f4..cfadfec4 100644
--- a/pydis_site/apps/api/models/bot/role.py
+++ b/pydis_site/apps/api/models/bot/role.py
@@ -22,7 +22,8 @@ class Role(ModelReprMixin, models.Model):
                 message="Role IDs cannot be negative."
             ),
         ),
-        help_text="The role ID, taken from Discord."
+        help_text="The role ID, taken from Discord.",
+        verbose_name="ID"
     )
     name = models.CharField(
         max_length=100,