diff --git a/src/registrar/admin.py b/src/registrar/admin.py index bac143c37..2e0f05e32 100644 --- a/src/registrar/admin.py +++ b/src/registrar/admin.py @@ -485,7 +485,7 @@ class MyUserAdmin(BaseUserAdmin): list_display = ( "username", - "email", + "overridden_email_field", "first_name", "last_name", # Group is a custom property defined within this file, @@ -494,6 +494,18 @@ class MyUserAdmin(BaseUserAdmin): "status", ) + # Renames inherited AbstractUser label 'email_address to 'email' + def formfield_for_dbfield(self, dbfield, **kwargs): + field = super().formfield_for_dbfield(dbfield, **kwargs) + if dbfield.name == 'email': + field.label = 'Email' + return field + + # Renames inherited AbstractUser column name 'email_address to 'email' + @admin.display(description=_("Email")) + def overridden_email_field(self, obj): + return obj.email + fieldsets = ( ( None, @@ -2021,13 +2033,39 @@ class FederalAgencyAdmin(ListHeaderAdmin): ordering = ["agency"] +class UserGroupAdmin(AuditedAdmin): + """Overwrite the generated UserGroup admin class""" + + list_display = [ + "user_group" + ] + + fieldsets = ( + (None, {'fields': ('name', 'permissions')}), + ) + + def formfield_for_dbfield(self, dbfield, **kwargs): + field = super().formfield_for_dbfield(dbfield, **kwargs) + if dbfield.name == 'name': + field.label = 'Group name' + if dbfield.name == 'permissions': + field.label = "User permissions" + return field + + # We name the custom prop 'Group' because linter + # is not allowing a short_description attr on it + # This gets around the linter limitation, for now. + @admin.display(description=_("Group")) + def user_group(self, obj): + return obj.name + admin.site.unregister(LogEntry) # Unregister the default registration admin.site.register(LogEntry, CustomLogEntryAdmin) admin.site.register(models.User, MyUserAdmin) # Unregister the built-in Group model admin.site.unregister(Group) # Register UserGroup -admin.site.register(models.UserGroup) +admin.site.register(models.UserGroup, UserGroupAdmin) admin.site.register(models.UserDomainRole, UserDomainRoleAdmin) admin.site.register(models.Contact, ContactAdmin) admin.site.register(models.DomainInvitation, DomainInvitationAdmin) diff --git a/src/registrar/models/domain_request.py b/src/registrar/models/domain_request.py index 36b88b83f..6b8a61f68 100644 --- a/src/registrar/models/domain_request.py +++ b/src/registrar/models/domain_request.py @@ -478,7 +478,7 @@ class DomainRequest(TimeStampedModel): is_election_board = models.BooleanField( null=True, blank=True, - verbose_name="election office", + verbose_name="Election office", help_text="Is your organization an election office?", )