+.object-tools > p > button.addlink {
+ background-image: url(../admin/img/tooltag-add.svg) !important;
+ background-repeat: no-repeat !important;
+ background-position: right 7px center !important;
+ padding-right: 25px;
}
.usa-modal--django-admin .usa-prose ul > li {
@@ -839,6 +838,17 @@ div.dja__model-description{
text-transform: capitalize;
}
+.module caption {
+ // Match the old size for django admin
+ font-size: 0.8125rem;
+}
+
+// text-bold doesn't work here due to style overrides, unfortunately.
+// This is a workaround.
+caption.text-bold {
+ font-weight: font-weight('bold');
+}
+
.wrapped-button-group {
// This button group has too many items
flex-wrap: wrap;
@@ -982,3 +992,7 @@ ul.add-list-reset {
}
}
+
+#result_list > tbody tr > th > a {
+ text-decoration: underline;
+}
diff --git a/src/registrar/assets/src/sass/_theme/_base.scss b/src/registrar/assets/src/sass/_theme/_base.scss
index 9ca1355c3..9a1c5d12b 100644
--- a/src/registrar/assets/src/sass/_theme/_base.scss
+++ b/src/registrar/assets/src/sass/_theme/_base.scss
@@ -275,6 +275,14 @@ abbr[title] {
width: 25%;
}
+.margin-top-3px {
+ margin-top: 3px;
+}
+
+.top-28px {
+ top: 28px;
+}
+
/*
NOTE: width: 3% basically forces a fit-content effect in the table.
Fit-content itself does not work.
diff --git a/src/registrar/assets/src/sass/_theme/_tables.scss b/src/registrar/assets/src/sass/_theme/_tables.scss
index 614d0348e..0e3118126 100644
--- a/src/registrar/assets/src/sass/_theme/_tables.scss
+++ b/src/registrar/assets/src/sass/_theme/_tables.scss
@@ -143,7 +143,7 @@ th {
}
.usa-table--bg-transparent {
- td, thead th {
+ td, th, thead th {
background-color: transparent;
}
}
diff --git a/src/registrar/assets/src/sass/_theme/_uswds-theme.scss b/src/registrar/assets/src/sass/_theme/_uswds-theme.scss
index 21bb48e96..951141a2b 100644
--- a/src/registrar/assets/src/sass/_theme/_uswds-theme.scss
+++ b/src/registrar/assets/src/sass/_theme/_uswds-theme.scss
@@ -70,6 +70,7 @@ in the form $setting: value,
----------------------------*/
$theme-font-weight-medium: 400,
$theme-font-weight-semibold: 600,
+ $theme-font-weight-bold: 700,
/*---------------------------
## Font roles
diff --git a/src/registrar/forms/portfolio.py b/src/registrar/forms/portfolio.py
index 9824ed68a..5aef09389 100644
--- a/src/registrar/forms/portfolio.py
+++ b/src/registrar/forms/portfolio.py
@@ -13,7 +13,16 @@ from registrar.models import (
Portfolio,
SeniorOfficial,
)
-from registrar.models.utility.portfolio_helper import UserPortfolioPermissionChoices, UserPortfolioRoleChoices
+from registrar.models.utility.portfolio_helper import (
+ UserPortfolioPermissionChoices,
+ UserPortfolioRoleChoices,
+ get_domain_requests_description_display,
+ get_domain_requests_display,
+ get_domains_description_display,
+ get_domains_display,
+ get_members_description_display,
+ get_members_display,
+)
logger = logging.getLogger(__name__)
@@ -126,8 +135,16 @@ class BasePortfolioMemberForm(forms.ModelForm):
domain_permissions = forms.ChoiceField(
choices=[
- (UserPortfolioPermissionChoices.VIEW_MANAGED_DOMAINS.value, "Viewer, limited"),
- (UserPortfolioPermissionChoices.VIEW_ALL_DOMAINS.value, "Viewer"),
+ (
+ UserPortfolioPermissionChoices.VIEW_MANAGED_DOMAINS.value,
+ get_domains_display(UserPortfolioRoleChoices.ORGANIZATION_MEMBER, None),
+ ),
+ (
+ UserPortfolioPermissionChoices.VIEW_ALL_DOMAINS.value,
+ get_domains_display(
+ UserPortfolioRoleChoices.ORGANIZATION_MEMBER, [UserPortfolioPermissionChoices.VIEW_ALL_DOMAINS]
+ ),
+ ),
],
widget=forms.RadioSelect,
required=False,
@@ -139,9 +156,19 @@ class BasePortfolioMemberForm(forms.ModelForm):
domain_request_permissions = forms.ChoiceField(
choices=[
- ("no_access", "No access"),
- (UserPortfolioPermissionChoices.VIEW_ALL_REQUESTS.value, "Viewer"),
- (UserPortfolioPermissionChoices.EDIT_REQUESTS.value, "Creator"),
+ ("no_access", get_domain_requests_display(UserPortfolioRoleChoices.ORGANIZATION_MEMBER, None)),
+ (
+ UserPortfolioPermissionChoices.VIEW_ALL_REQUESTS.value,
+ get_domain_requests_display(
+ UserPortfolioRoleChoices.ORGANIZATION_MEMBER, [UserPortfolioPermissionChoices.VIEW_ALL_REQUESTS]
+ ),
+ ),
+ (
+ UserPortfolioPermissionChoices.EDIT_REQUESTS.value,
+ get_domain_requests_display(
+ UserPortfolioRoleChoices.ORGANIZATION_MEMBER, [UserPortfolioPermissionChoices.EDIT_REQUESTS]
+ ),
+ ),
],
widget=forms.RadioSelect,
required=False,
@@ -153,8 +180,13 @@ class BasePortfolioMemberForm(forms.ModelForm):
member_permissions = forms.ChoiceField(
choices=[
- ("no_access", "No access"),
- (UserPortfolioPermissionChoices.VIEW_MEMBERS.value, "Viewer"),
+ ("no_access", get_members_display(UserPortfolioRoleChoices.ORGANIZATION_MEMBER, None)),
+ (
+ UserPortfolioPermissionChoices.VIEW_MEMBERS.value,
+ get_members_display(
+ UserPortfolioRoleChoices.ORGANIZATION_MEMBER, [UserPortfolioPermissionChoices.VIEW_MEMBERS]
+ ),
+ ),
],
widget=forms.RadioSelect,
required=False,
@@ -191,19 +223,31 @@ class BasePortfolioMemberForm(forms.ModelForm):
# Adds a
description beneath each option
self.fields["domain_permissions"].descriptions = {
- UserPortfolioPermissionChoices.VIEW_MANAGED_DOMAINS.value: "Can view only the domains they manage",
- UserPortfolioPermissionChoices.VIEW_ALL_DOMAINS.value: "Can view all domains for the organization",
+ UserPortfolioPermissionChoices.VIEW_MANAGED_DOMAINS.value: get_domains_description_display(
+ UserPortfolioRoleChoices.ORGANIZATION_MEMBER, None
+ ),
+ UserPortfolioPermissionChoices.VIEW_ALL_DOMAINS.value: get_domains_description_display(
+ UserPortfolioRoleChoices.ORGANIZATION_MEMBER, [UserPortfolioPermissionChoices.VIEW_ALL_DOMAINS]
+ ),
}
self.fields["domain_request_permissions"].descriptions = {
UserPortfolioPermissionChoices.EDIT_REQUESTS.value: (
- "Can view all domain requests for the organization and create requests"
+ get_domain_requests_description_display(
+ UserPortfolioRoleChoices.ORGANIZATION_MEMBER, [UserPortfolioPermissionChoices.EDIT_REQUESTS]
+ )
),
- UserPortfolioPermissionChoices.VIEW_ALL_REQUESTS.value: "Can view all domain requests for the organization",
- "no_access": "Cannot view or create domain requests",
+ UserPortfolioPermissionChoices.VIEW_ALL_REQUESTS.value: (
+ get_domain_requests_description_display(
+ UserPortfolioRoleChoices.ORGANIZATION_MEMBER, [UserPortfolioPermissionChoices.VIEW_ALL_REQUESTS]
+ )
+ ),
+ "no_access": get_domain_requests_description_display(UserPortfolioRoleChoices.ORGANIZATION_MEMBER, None),
}
self.fields["member_permissions"].descriptions = {
- UserPortfolioPermissionChoices.VIEW_MEMBERS.value: "Can view all members permissions",
- "no_access": "Cannot view member permissions",
+ UserPortfolioPermissionChoices.VIEW_MEMBERS.value: get_members_description_display(
+ UserPortfolioRoleChoices.ORGANIZATION_MEMBER, [UserPortfolioPermissionChoices.VIEW_MEMBERS]
+ ),
+ "no_access": get_members_description_display(UserPortfolioRoleChoices.ORGANIZATION_MEMBER, None),
}
# Map model instance values to custom form fields
@@ -218,6 +262,9 @@ class BasePortfolioMemberForm(forms.ModelForm):
cleaned_data = super().clean()
role = cleaned_data.get("role")
+ # handle role
+ cleaned_data["roles"] = [role] if role else []
+
# Get required fields for the selected role. Then validate all required fields for the role.
required_fields = self.ROLE_REQUIRED_FIELDS.get(role, [])
for field_name in required_fields:
@@ -236,9 +283,6 @@ class BasePortfolioMemberForm(forms.ModelForm):
if cleaned_data.get("member_permissions") == "no_access":
cleaned_data["member_permissions"] = None
- # Handle roles
- cleaned_data["roles"] = [role]
-
# Handle additional_permissions
valid_fields = self.ROLE_REQUIRED_FIELDS.get(role, [])
additional_permissions = {cleaned_data.get(field) for field in valid_fields if cleaned_data.get(field)}
diff --git a/src/registrar/management/commands/disclose_security_emails.py b/src/registrar/management/commands/disclose_security_emails.py
index 62989e4c0..62456747a 100644
--- a/src/registrar/management/commands/disclose_security_emails.py
+++ b/src/registrar/management/commands/disclose_security_emails.py
@@ -1,4 +1,4 @@
-""""
+""" "
Converts all ready and DNS needed domains with a non-default public contact
to disclose their public contact. Created for Issue#1535 to resolve
disclose issue of domains with missing security emails.
diff --git a/src/registrar/management/commands/master_domain_migrations.py b/src/registrar/management/commands/master_domain_migrations.py
index 7f702e047..2907add06 100644
--- a/src/registrar/management/commands/master_domain_migrations.py
+++ b/src/registrar/management/commands/master_domain_migrations.py
@@ -1,8 +1,8 @@
"""Data migration:
- 1 - generates a report of data integrity across all
- transition domain related tables
- 2 - allows users to run all migration scripts for
- transition domain data
+1 - generates a report of data integrity across all
+transition domain related tables
+2 - allows users to run all migration scripts for
+transition domain data
"""
import logging
diff --git a/src/registrar/management/commands/populate_domain_updated_federal_agency.py b/src/registrar/management/commands/populate_domain_updated_federal_agency.py
index dd8ceb3b2..3fbf2792c 100644
--- a/src/registrar/management/commands/populate_domain_updated_federal_agency.py
+++ b/src/registrar/management/commands/populate_domain_updated_federal_agency.py
@@ -1,4 +1,4 @@
-""""
+""" "
Data migration: Renaming deprecated Federal Agencies to
their new updated names ie (U.S. Peace Corps to Peace Corps)
within Domain Information and Domain Requests
diff --git a/src/registrar/models/domain.py b/src/registrar/models/domain.py
index 42310c3bb..d3c0ed347 100644
--- a/src/registrar/models/domain.py
+++ b/src/registrar/models/domain.py
@@ -2,6 +2,7 @@ from itertools import zip_longest
import logging
import ipaddress
import re
+import time
from datetime import date, timedelta
from typing import Optional
from django.db import transaction
@@ -750,11 +751,7 @@ class Domain(TimeStampedModel, DomainHelper):
successTotalNameservers = len(oldNameservers) - deleteCount + addToDomainCount
- try:
- self._delete_hosts_if_not_used(hostsToDelete=deleted_values)
- except Exception as e:
- # we don't need this part to succeed in order to continue.
- logger.error("Failed to delete nameserver hosts: %s", e)
+ self._delete_hosts_if_not_used(hostsToDelete=deleted_values)
if successTotalNameservers < 2:
try:
@@ -1038,13 +1035,13 @@ class Domain(TimeStampedModel, DomainHelper):
logger.error(f"registry error removing client hold: {err}")
raise (err)
- def _delete_domain(self):
+ def _delete_domain(self): # noqa
"""This domain should be deleted from the registry
may raises RegistryError, should be caught or handled correctly by caller"""
logger.info("Deleting subdomains for %s", self.name)
# check if any subdomains are in use by another domain
- hosts = Host.objects.filter(name__regex=r".+{}".format(self.name))
+ hosts = Host.objects.filter(name__regex=r".+\.{}".format(self.name))
for host in hosts:
if host.domain != self:
logger.error("Unable to delete host: %s is in use by another domain: %s", host.name, host.domain)
@@ -1052,38 +1049,119 @@ class Domain(TimeStampedModel, DomainHelper):
code=ErrorCode.OBJECT_ASSOCIATION_PROHIBITS_OPERATION,
note=f"Host {host.name} is in use by {host.domain}",
)
+ try:
+ # set hosts to empty list so nameservers are deleted
+ (
+ deleted_values,
+ updated_values,
+ new_values,
+ oldNameservers,
+ ) = self.getNameserverChanges(hosts=[])
- (
- deleted_values,
- updated_values,
- new_values,
- oldNameservers,
- ) = self.getNameserverChanges(hosts=[])
-
- _ = self._update_host_values(updated_values, oldNameservers) # returns nothing, just need to be run and errors
- addToDomainList, _ = self.createNewHostList(new_values)
- deleteHostList, _ = self.createDeleteHostList(deleted_values)
- responseCode = self.addAndRemoveHostsFromDomain(hostsToAdd=addToDomainList, hostsToDelete=deleteHostList)
-
+ # update the hosts
+ _ = self._update_host_values(
+ updated_values, oldNameservers
+ ) # returns nothing, just need to be run and errors
+ addToDomainList, _ = self.createNewHostList(new_values)
+ deleteHostList, _ = self.createDeleteHostList(deleted_values)
+ responseCode = self.addAndRemoveHostsFromDomain(hostsToAdd=addToDomainList, hostsToDelete=deleteHostList)
+ except RegistryError as e:
+ logger.error(f"Error trying to delete hosts from domain {self}: {e}")
+ raise e
# if unable to update domain raise error and stop
if responseCode != ErrorCode.COMMAND_COMPLETED_SUCCESSFULLY:
raise NameserverError(code=nsErrorCodes.BAD_DATA)
+ logger.info("Finished removing nameservers from domain")
+
# addAndRemoveHostsFromDomain removes the hosts from the domain object,
# but we still need to delete the object themselves
self._delete_hosts_if_not_used(hostsToDelete=deleted_values)
+ logger.info("Finished _delete_hosts_if_not_used inside _delete_domain()")
+ # delete the non-registrant contacts
logger.debug("Deleting non-registrant contacts for %s", self.name)
contacts = PublicContact.objects.filter(domain=self)
- for contact in contacts:
- if contact.contact_type != PublicContact.ContactTypeChoices.REGISTRANT:
- self._update_domain_with_contact(contact, rem=True)
- request = commands.DeleteContact(contact.registry_id)
- registry.send(request, cleaned=True)
+ logger.info(f"retrieved contacts for domain: {contacts}")
- logger.info("Deleting domain %s", self.name)
+ for contact in contacts:
+ try:
+ if contact.contact_type != PublicContact.ContactTypeChoices.REGISTRANT:
+ logger.info(f"Deleting contact: {contact}")
+ try:
+ self._update_domain_with_contact(contact, rem=True)
+ except Exception as e:
+ logger.error(f"Error while updating domain with contact: {contact}, e: {e}", exc_info=True)
+ request = commands.DeleteContact(contact.registry_id)
+ registry.send(request, cleaned=True)
+ logger.info(f"sent DeleteContact for {contact}")
+ except RegistryError as e:
+ logger.error(f"Error deleting contact: {contact}, {e}", exc_info=True)
+
+ logger.info(f"Finished deleting contacts for {self.name}")
+
+ # delete ds data if it exists
+ if self.dnssecdata:
+ logger.debug("Deleting ds data for %s", self.name)
+ try:
+ # set and unset client hold to be able to change ds data
+ logger.info("removing client hold")
+ self._remove_client_hold()
+ self.dnssecdata = None
+ logger.info("placing client hold")
+ self._place_client_hold()
+ except RegistryError as e:
+ logger.error("Error deleting ds data for %s: %s", self.name, e)
+ e.note = "Error deleting ds data for %s" % self.name
+ raise e
+
+ # check if the domain can be deleted
+ if not self._domain_can_be_deleted():
+ note = "Domain has associated objects that prevent deletion."
+ raise RegistryError(code=ErrorCode.COMMAND_FAILED, note=note)
+
+ # delete the domain
request = commands.DeleteDomain(name=self.name)
- registry.send(request, cleaned=True)
+ try:
+ registry.send(request, cleaned=True)
+ logger.info("Domain %s deleted successfully.", self.name)
+ except RegistryError as e:
+ logger.error("Error deleting domain %s: %s", self.name, e)
+ raise e
+
+ def _domain_can_be_deleted(self, max_attempts=5, wait_interval=2) -> bool:
+ """
+ Polls the registry using InfoDomain calls to confirm that the domain can be deleted.
+ Returns True if the domain can be deleted, False otherwise. Includes a retry mechanism
+ using wait_interval and max_attempts, which may be necessary if subdomains and other
+ associated objects were only recently deleted as the registry may not be immediately updated.
+ """
+ logger.info("Polling registry to confirm deletion pre-conditions for %s", self.name)
+ last_info_error = None
+ for attempt in range(max_attempts):
+ try:
+ info_response = registry.send(commands.InfoDomain(name=self.name), cleaned=True)
+ domain_info = info_response.res_data[0]
+ hosts_associated = getattr(domain_info, "hosts", None)
+ if hosts_associated is None or len(hosts_associated) == 0:
+ logger.info("InfoDomain reports no associated hosts for %s. Proceeding with deletion.", self.name)
+ return True
+ else:
+ logger.info("Attempt %d: Domain %s still has hosts: %s", attempt + 1, self.name, hosts_associated)
+ except RegistryError as info_e:
+ # If the domain is already gone, we can assume deletion already occurred.
+ if info_e.code == ErrorCode.OBJECT_DOES_NOT_EXIST:
+ logger.info("InfoDomain check indicates domain %s no longer exists.", self.name)
+ raise info_e
+ logger.warning("Attempt %d: Error during InfoDomain check: %s", attempt + 1, info_e)
+ time.sleep(wait_interval)
+ else:
+ logger.error(
+ "Exceeded max attempts waiting for domain %s to clear associated objects; last error: %s",
+ self.name,
+ last_info_error,
+ )
+ return False
def __str__(self) -> str:
return self.name
@@ -1840,8 +1918,6 @@ class Domain(TimeStampedModel, DomainHelper):
else:
logger.error("Error _delete_hosts_if_not_used, code was %s error was %s" % (e.code, e))
- raise e
-
def _fix_unknown_state(self, cleaned):
"""
_fix_unknown_state: Calls _add_missing_contacts_if_unknown
diff --git a/src/registrar/models/portfolio_invitation.py b/src/registrar/models/portfolio_invitation.py
index 99febc92e..fafa99856 100644
--- a/src/registrar/models/portfolio_invitation.py
+++ b/src/registrar/models/portfolio_invitation.py
@@ -9,8 +9,11 @@ from .utility.portfolio_helper import (
UserPortfolioPermissionChoices,
UserPortfolioRoleChoices,
cleanup_after_portfolio_member_deletion,
+ get_domain_requests_description_display,
get_domain_requests_display,
+ get_domains_description_display,
get_domains_display,
+ get_members_description_display,
get_members_display,
get_role_display,
validate_portfolio_invitation,
@@ -115,6 +118,16 @@ class PortfolioInvitation(TimeStampedModel):
"""
return get_domains_display(self.roles, self.additional_permissions)
+ @property
+ def domains_description_display(self):
+ """
+ Returns a string description of the user's domain access level.
+
+ Returns:
+ str: The display name of the user's domain permissions description.
+ """
+ return get_domains_description_display(self.roles, self.additional_permissions)
+
@property
def domain_requests_display(self):
"""
@@ -129,6 +142,16 @@ class PortfolioInvitation(TimeStampedModel):
"""
return get_domain_requests_display(self.roles, self.additional_permissions)
+ @property
+ def domain_requests_description_display(self):
+ """
+ Returns a string description of the user's access to domain requests.
+
+ Returns:
+ str: The display name of the user's domain request permissions description.
+ """
+ return get_domain_requests_description_display(self.roles, self.additional_permissions)
+
@property
def members_display(self):
"""
@@ -143,6 +166,16 @@ class PortfolioInvitation(TimeStampedModel):
"""
return get_members_display(self.roles, self.additional_permissions)
+ @property
+ def members_description_display(self):
+ """
+ Returns a string description of the user's access to managing members.
+
+ Returns:
+ str: The display name of the user's member management permissions description.
+ """
+ return get_members_description_display(self.roles, self.additional_permissions)
+
@transition(field="status", source=PortfolioInvitationStatus.INVITED, target=PortfolioInvitationStatus.RETRIEVED)
def retrieve(self):
"""When an invitation is retrieved, create the corresponding permission.
diff --git a/src/registrar/models/user_portfolio_permission.py b/src/registrar/models/user_portfolio_permission.py
index e077daa57..0a758ff6a 100644
--- a/src/registrar/models/user_portfolio_permission.py
+++ b/src/registrar/models/user_portfolio_permission.py
@@ -7,8 +7,11 @@ from registrar.models.utility.portfolio_helper import (
MemberPermissionDisplay,
cleanup_after_portfolio_member_deletion,
get_domain_requests_display,
+ get_domain_requests_description_display,
get_domains_display,
+ get_domains_description_display,
get_members_display,
+ get_members_description_display,
get_role_display,
validate_user_portfolio_permission,
)
@@ -211,6 +214,16 @@ class UserPortfolioPermission(TimeStampedModel):
"""
return get_domains_display(self.roles, self.additional_permissions)
+ @property
+ def domains_description_display(self):
+ """
+ Returns a string description of the user's domain access level.
+
+ Returns:
+ str: The display name of the user's domain permissions description.
+ """
+ return get_domains_description_display(self.roles, self.additional_permissions)
+
@property
def domain_requests_display(self):
"""
@@ -225,6 +238,16 @@ class UserPortfolioPermission(TimeStampedModel):
"""
return get_domain_requests_display(self.roles, self.additional_permissions)
+ @property
+ def domain_requests_description_display(self):
+ """
+ Returns a string description of the user's access to domain requests.
+
+ Returns:
+ str: The display name of the user's domain request permissions description.
+ """
+ return get_domain_requests_description_display(self.roles, self.additional_permissions)
+
@property
def members_display(self):
"""
@@ -239,6 +262,16 @@ class UserPortfolioPermission(TimeStampedModel):
"""
return get_members_display(self.roles, self.additional_permissions)
+ @property
+ def members_description_display(self):
+ """
+ Returns a string description of the user's access to managing members.
+
+ Returns:
+ str: The display name of the user's member management permissions description.
+ """
+ return get_members_description_display(self.roles, self.additional_permissions)
+
def clean(self):
"""Extends clean method to perform additional validation, which can raise errors in django admin."""
super().clean()
diff --git a/src/registrar/models/utility/portfolio_helper.py b/src/registrar/models/utility/portfolio_helper.py
index 03733237e..e94733fb6 100644
--- a/src/registrar/models/utility/portfolio_helper.py
+++ b/src/registrar/models/utility/portfolio_helper.py
@@ -123,6 +123,25 @@ def get_domains_display(roles, permissions):
return "Viewer, limited"
+def get_domains_description_display(roles, permissions):
+ """
+ Determines the display description for a user's domain viewing permissions.
+
+ Args:
+ roles (list): A list of role strings assigned to the user.
+ permissions (list): A list of additional permissions assigned to the user.
+
+ Returns:
+ str: A string representing the user's domain viewing access description.
+ """
+ UserPortfolioPermission = apps.get_model("registrar.UserPortfolioPermission")
+ all_permissions = UserPortfolioPermission.get_portfolio_permissions(roles, permissions)
+ if UserPortfolioPermissionChoices.VIEW_ALL_DOMAINS in all_permissions:
+ return "Can view all domains for the organization"
+ else:
+ return "Can view only the domains they manage"
+
+
def get_domain_requests_display(roles, permissions):
"""
Determines the display name for a user's domain request permissions.
@@ -148,6 +167,27 @@ def get_domain_requests_display(roles, permissions):
return "No access"
+def get_domain_requests_description_display(roles, permissions):
+ """
+ Determines the display description for a user's domain request permissions.
+
+ Args:
+ roles (list): A list of role strings assigned to the user.
+ permissions (list): A list of additional permissions assigned to the user.
+
+ Returns:
+ str: A string representing the user's domain request access level description.
+ """
+ UserPortfolioPermission = apps.get_model("registrar.UserPortfolioPermission")
+ all_permissions = UserPortfolioPermission.get_portfolio_permissions(roles, permissions)
+ if UserPortfolioPermissionChoices.EDIT_REQUESTS in all_permissions:
+ return "Can view all domain requests for the organization and create requests"
+ elif UserPortfolioPermissionChoices.VIEW_ALL_REQUESTS in all_permissions:
+ return "Can view all domain requests for the organization"
+ else:
+ return "Cannot view or create domain requests"
+
+
def get_members_display(roles, permissions):
"""
Determines the display name for a user's member management permissions.
@@ -173,6 +213,27 @@ def get_members_display(roles, permissions):
return "No access"
+def get_members_description_display(roles, permissions):
+ """
+ Determines the display description for a user's member management permissions.
+
+ Args:
+ roles (list): A list of role strings assigned to the user.
+ permissions (list): A list of additional permissions assigned to the user.
+
+ Returns:
+ str: A string representing the user's member management access level description.
+ """
+ UserPortfolioPermission = apps.get_model("registrar.UserPortfolioPermission")
+ all_permissions = UserPortfolioPermission.get_portfolio_permissions(roles, permissions)
+ if UserPortfolioPermissionChoices.EDIT_MEMBERS in all_permissions:
+ return "Can view and manage all member permissions"
+ elif UserPortfolioPermissionChoices.VIEW_MEMBERS in all_permissions:
+ return "Can view all member permissions"
+ else:
+ return "Cannot view member permissions"
+
+
def validate_user_portfolio_permission(user_portfolio_permission):
"""
Validates a UserPortfolioPermission instance. Located in portfolio_helper to avoid circular imports
diff --git a/src/registrar/templates/admin/app_list.html b/src/registrar/templates/admin/app_list.html
index aaf3dc423..ecce12a3e 100644
--- a/src/registrar/templates/admin/app_list.html
+++ b/src/registrar/templates/admin/app_list.html
@@ -4,24 +4,22 @@
{% for app in app_list %}
-
- {# .gov override: add headers #}
- {% if show_changelinks %}
-
- {% else %}
-
- {% endif %}
+ {# .gov override: display the app name as a caption rather than a table header #}
+ {{ app.name }}
- {% if show_changelinks %}
- |
- {{ app.name }}
- |
- {% else %}
-
- {{ app.name }}
- |
- {% endif %}
+ {# .gov override: hide headers #}
+ {% comment %}
+ {% if show_changelinks %}
+
+ {{ app.name }}
+ |
+ {% else %}
+
+ {{ app.name }}
+ |
+ {% endif %}
+ {% endcomment %}
| Model |
@@ -45,16 +43,17 @@
{% endif %}
{% if model.add_url %}
- {% translate 'Add' %} |
+ {% comment %} Remove the 's' from the end of the string to avoid text like "Add domain requests" {% endcomment %}
+ {% translate 'Add' %} |
{% else %}
|
{% endif %}
{% if model.admin_url and show_changelinks %}
{% if model.view_only %}
- {% translate 'View' %} |
+ {% translate 'View' %} |
{% else %}
- {% translate 'Change' %} |
+ {% translate 'Change' %} |
{% endif %}
{% elif show_changelinks %}
|
@@ -64,9 +63,20 @@
{% endfor %}
-
-
Analytics
-
Dashboard
+
+
+ Analytics
+
+
+ | Reports |
+
+
+
+
+ | Dashboard |
+
+
+
{% else %}
{% translate 'You don’t have permission to view or edit anything.' %}
diff --git a/src/registrar/templates/admin/change_form_object_tools.html b/src/registrar/templates/admin/change_form_object_tools.html
index 2f3d282ea..d2ec555e2 100644
--- a/src/registrar/templates/admin/change_form_object_tools.html
+++ b/src/registrar/templates/admin/change_form_object_tools.html
@@ -7,10 +7,10 @@
{% if has_absolute_url %}
{% else %}
@@ -30,18 +30,18 @@
{% endif %}
- {% translate "History" %}
+
{% if opts.model_name == 'domainrequest' %}
-
+
+
{% endif %}
diff --git a/src/registrar/templates/admin/change_list_object_tools.html b/src/registrar/templates/admin/change_list_object_tools.html
index 9a046b4bb..5ba88aa3a 100644
--- a/src/registrar/templates/admin/change_list_object_tools.html
+++ b/src/registrar/templates/admin/change_list_object_tools.html
@@ -5,9 +5,9 @@
{% if has_add_permission %}
{% url cl.opts|admin_urlname:'add' as add_url %}
-
+
+
{% endif %}
{% endblock %}
\ No newline at end of file
diff --git a/src/registrar/templates/admin/change_list_results.html b/src/registrar/templates/admin/change_list_results.html
index 5e4f37711..c5be04133 100644
--- a/src/registrar/templates/admin/change_list_results.html
+++ b/src/registrar/templates/admin/change_list_results.html
@@ -19,11 +19,11 @@ Load our custom filters to extract info from the django generated markup.
{% if results.0|contains_checkbox %}
{# .gov - hardcode the select all checkbox #}
-
+ |
-
+
@@ -34,9 +34,9 @@ Load our custom filters to extract info from the django generated markup.
{% if header.sortable %}
{% if header.sort_priority > 0 %}
-
+
{% if num_sorted_fields > 1 %} {{ header.sort_priority }}{% endif %}
-
+
|
{% with result_value=result.0|extract_value %}
- {% with result_label=result.1|extract_a_text %}
+ {% with result_label=result.1|extract_a_text checkbox_id="select-"|add:result_value %}
|
-
-
+
+
|
{% endwith %}
{% endwith %}
diff --git a/src/registrar/templates/admin/import_export/change_list_export_item.html b/src/registrar/templates/admin/import_export/change_list_export_item.html
new file mode 100644
index 000000000..9678d224a
--- /dev/null
+++ b/src/registrar/templates/admin/import_export/change_list_export_item.html
@@ -0,0 +1,7 @@
+{% load i18n %}
+{% load admin_urls %}
+
+{% if has_export_permission %}
+{% comment %} Uses the initButtonLinks {% endcomment %}
+
+{% endif %}
diff --git a/src/registrar/templates/admin/import_export/change_list_import_item.html b/src/registrar/templates/admin/import_export/change_list_import_item.html
index 8255a8ba7..0f2d59421 100644
--- a/src/registrar/templates/admin/import_export/change_list_import_item.html
+++ b/src/registrar/templates/admin/import_export/change_list_import_item.html
@@ -3,6 +3,6 @@
{% if has_import_permission %}
{% if not IS_PRODUCTION %}
-{% trans "Import" %}
+
{% endif %}
{% endif %}
diff --git a/src/registrar/templates/admin/search_form.html b/src/registrar/templates/admin/search_form.html
new file mode 100644
index 000000000..c5fcf31f8
--- /dev/null
+++ b/src/registrar/templates/admin/search_form.html
@@ -0,0 +1,26 @@
+{% comment %} This is an override of the django search bar to add better accessibility compliance.
+There are no blocks defined here, so we had to copy the code.
+https://github.com/django/django/blob/main/django/contrib/admin/templates/admin/search_form.html
+{% endcomment %}
+{% load i18n static %}
+{% if cl.search_fields %}
+
+{% endif %}
\ No newline at end of file
diff --git a/src/registrar/templates/django/admin/portfolio_invitation_delete_confirmation.html b/src/registrar/templates/django/admin/portfolio_invitation_delete_confirmation.html
new file mode 100644
index 000000000..932822766
--- /dev/null
+++ b/src/registrar/templates/django/admin/portfolio_invitation_delete_confirmation.html
@@ -0,0 +1,17 @@
+{% extends "admin/delete_confirmation.html" %}
+
+{% block content_subtitle %}
+
+
+
+ If you cancel the portfolio invitation here, it won't trigger any emails. It also won't remove the user's
+ portfolio access if they already logged in. Go to the
+
+ User Portfolio Permissions
+
+ table if you want to remove the user from a portfolio.
+
+
+
+
+
+ If you remove someone from a portfolio here, it will not send any emails when you click "Save".
+
+
+
{{ description }}
+ {{ description }}
{% endif %}
{% endwith %}
{% endif %}
diff --git a/src/registrar/templates/domain_add_user.html b/src/registrar/templates/domain_add_user.html
index abc549a82..8ef167f98 100644
--- a/src/registrar/templates/domain_add_user.html
+++ b/src/registrar/templates/domain_add_user.html
@@ -42,17 +42,18 @@
{% endblock breadcrumb %}
Add a domain manager
-{% if has_organization_feature_flag %}
+ {% if portfolio %}
+
+ Provide an email address for the domain manager you’d like to add.
+ They’ll need to access the registrar using a Login.gov account that’s associated with this email address.
+ Domain managers can be a member of only one .gov organization.
+
+ {% else %}
- You can add another user to help manage your domain. Users can only be a member of one .gov organization,
- and they'll need to sign in with their Login.gov account.
+ Provide an email address for the domain manager you’d like to add.
+ They’ll need to access the registrar using a Login.gov account that’s associated with this email address.
-{% else %}
-
- You can add another user to help manage your domain. They will need to sign in to the .gov registrar with
- their Login.gov account.
-
-{% endif %}
+ {% endif %}
{}