diff --git a/src/registrar/admin.py b/src/registrar/admin.py index b2d291ce5..30c8e8b89 100644 --- a/src/registrar/admin.py +++ b/src/registrar/admin.py @@ -51,7 +51,9 @@ class MyHostAdmin(AuditedAdmin): admin.site.register(models.User, MyUserAdmin) +admin.site.register(models.UserDomainRole, AuditedAdmin) admin.site.register(models.Contact, AuditedAdmin) +admin.site.register(models.DomainInvitation, AuditedAdmin) admin.site.register(models.DomainApplication, AuditedAdmin) admin.site.register(models.Domain, AuditedAdmin) admin.site.register(models.Host, MyHostAdmin) diff --git a/src/registrar/fixtures.py b/src/registrar/fixtures.py index 4edca7cf6..e2ced373d 100644 --- a/src/registrar/fixtures.py +++ b/src/registrar/fixtures.py @@ -39,6 +39,10 @@ class UserFixture: "first_name": "Logan", "last_name": "", }, + { + "username": "2ffe71b0-cea4-4097-8fb6-7a35b901dd70", + "first_name": "Neil", + "last_name": "Martinsen-Burrell", ] @classmethod diff --git a/src/registrar/models/user.py b/src/registrar/models/user.py index a3ab68511..963771ec3 100644 --- a/src/registrar/models/user.py +++ b/src/registrar/models/user.py @@ -44,3 +44,4 @@ class User(AbstractUser): email=self.email, status=DomainInvitation.SENT ): invitation.retrieve() + invitation.save() diff --git a/src/registrar/templates/domain_add_user.html b/src/registrar/templates/domain_add_user.html index 1a1c45aa3..87b141570 100644 --- a/src/registrar/templates/domain_add_user.html +++ b/src/registrar/templates/domain_add_user.html @@ -4,13 +4,6 @@ {% block title %}Add another user{% endblock %} {% block domain_content %} -
- - Back to user management - -
You can add another user to help manage your domain. They will need to sign diff --git a/src/registrar/templates/emails/domain_invitation.txt b/src/registrar/templates/emails/domain_invitation.txt index c72730f2d..8bfb53933 100644 --- a/src/registrar/templates/emails/domain_invitation.txt +++ b/src/registrar/templates/emails/domain_invitation.txt @@ -1,5 +1,5 @@ -You have been invited to manage a domain on get.gov, the registrar for -.gov domain names. +You have been invited to manage the domain {{ domain.name }} on get.gov, +the registrar for .gov domain names. To accept your invitation, go to <{{ domain_url }}>.