From b4506d015735fdfb993af7b9ac377f536f16e0ff Mon Sep 17 00:00:00 2001 From: Rachid Mrad Date: Fri, 29 Sep 2023 18:52:59 -0400 Subject: [PATCH] Clean up group display string --- src/registrar/admin.py | 15 ++++++++++----- src/registrar/tests/test_admin.py | 2 +- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/registrar/admin.py b/src/registrar/admin.py index 77565c1f4..dcec51444 100644 --- a/src/registrar/admin.py +++ b/src/registrar/admin.py @@ -135,13 +135,18 @@ class MyUserAdmin(BaseUserAdmin): "email", "first_name", "last_name", - "first_group", + "group", "status", ) - # First group (which should in theory be the ONLY group) - def first_group(self, obj): - return f"{obj.groups.first()}" + # Let's define First group + # (which should in theory be the ONLY group) + def group(self, obj): + if f"{obj.groups.first()}" == "full_access_group": + return "Super User" + elif f"{obj.groups.first()}" == "cisa_analysts_group": + return "Analyst" + return "" fieldsets = ( ( @@ -215,7 +220,7 @@ class MyUserAdmin(BaseUserAdmin): "email", "first_name", "last_name", - "first_group", + "group", "status", ) diff --git a/src/registrar/tests/test_admin.py b/src/registrar/tests/test_admin.py index 389613dcd..7ce2a961c 100644 --- a/src/registrar/tests/test_admin.py +++ b/src/registrar/tests/test_admin.py @@ -786,7 +786,7 @@ class MyUserAdminTest(TestCase): "email", "first_name", "last_name", - "first_group", + "group", "status", )