From ed4e30c9597a30ef956d6aedf389eb5090bf8d75 Mon Sep 17 00:00:00 2001 From: Rachid Mrad Date: Thu, 5 Dec 2024 15:32:27 -0500 Subject: [PATCH 01/20] infrastructure --- .../includes/member_domains_edit_table.html | 115 ++++++++++++++++++ .../includes/member_domains_table.html | 2 +- .../portfolio_member_domains_edit.html | 51 ++++++++ 3 files changed, 167 insertions(+), 1 deletion(-) create mode 100644 src/registrar/templates/includes/member_domains_edit_table.html create mode 100644 src/registrar/templates/portfolio_member_domains_edit.html diff --git a/src/registrar/templates/includes/member_domains_edit_table.html b/src/registrar/templates/includes/member_domains_edit_table.html new file mode 100644 index 000000000..ff87dd999 --- /dev/null +++ b/src/registrar/templates/includes/member_domains_edit_table.html @@ -0,0 +1,115 @@ +{% load static %} + +{% if member %} + +{% else %} + +{% endif %} + +{% comment %} Stores the json endpoint in a url for easier access {% endcomment %} +{% url 'get_member_domains_edit_json' as url %} + +
+ +

+ Domains assigned to + {% if member %} + {{ member.email }} + {% else %} + {{ portfolio_invitation.email }} + {% endif %} +

+ +
+ +
+
+ +
+
+
+ + + + + +
+ diff --git a/src/registrar/templates/includes/member_domains_table.html b/src/registrar/templates/includes/member_domains_table.html index 77d9b9891..c95196c51 100644 --- a/src/registrar/templates/includes/member_domains_table.html +++ b/src/registrar/templates/includes/member_domains_table.html @@ -37,7 +37,7 @@

-
+
- diff --git a/src/registrar/views/__init__.py b/src/registrar/views/__init__.py index 9a9cb7856..10d8acf92 100644 --- a/src/registrar/views/__init__.py +++ b/src/registrar/views/__init__.py @@ -20,4 +20,5 @@ from .portfolios import * from .transfer_user import TransferUserView from .member_domains_json import PortfolioMemberDomainsJson +from .member_domains_edit_json import PortfolioMemberDomainsEditJson from .portfolio_members_json import PortfolioMembersJson diff --git a/src/registrar/views/member_domains_edit_json.py b/src/registrar/views/member_domains_edit_json.py new file mode 100644 index 000000000..3d06a9d85 --- /dev/null +++ b/src/registrar/views/member_domains_edit_json.py @@ -0,0 +1,121 @@ +import logging +from django.http import JsonResponse +from django.core.paginator import Paginator +from django.shortcuts import get_object_or_404 +from django.views import View +from registrar.models import UserDomainRole, Domain, DomainInformation, User +from django.urls import reverse +from django.db.models import Q + +from registrar.models.domain_invitation import DomainInvitation +from registrar.views.utility.mixins import PortfolioMemberDomainsEditPermission + +logger = logging.getLogger(__name__) + + +class PortfolioMemberDomainsEditJson(PortfolioMemberDomainsEditPermission, View): + + def get(self, request): + """Given the current request, + get all domains that are associated with the portfolio, or + associated with the member/invited member""" + + domain_ids = self.get_domain_ids_from_request(request) + + objects = Domain.objects.filter(id__in=domain_ids).select_related("domain_info__sub_organization") + unfiltered_total = objects.count() + + objects = self.apply_search(objects, request) + objects = self.apply_sorting(objects, request) + + paginator = Paginator(objects, 10) + page_number = request.GET.get("page") + page_obj = paginator.get_page(page_number) + + domains = [self.serialize_domain(domain, request.user) for domain in page_obj.object_list] + + return JsonResponse( + { + "domains": domains, + "page": page_obj.number, + "num_pages": paginator.num_pages, + "has_previous": page_obj.has_previous(), + "has_next": page_obj.has_next(), + "total": paginator.count, + "unfiltered_total": unfiltered_total, + } + ) + + def get_domain_ids_from_request(self, request): + """Get domain ids from request. + + request.get.email - email address of invited member + request.get.member_id - member id of member + request.get.portfolio - portfolio id of portfolio + request.get.member_only - whether to return only domains associated with member + or to return all domains in the portfolio + """ + portfolio = request.GET.get("portfolio") + email = request.GET.get("email") + member_id = request.GET.get("member_id") + member_only = request.GET.get("member_only", "false").lower() in ["true", "1"] + if member_only: + if member_id: + member = get_object_or_404(User, pk=member_id) + domain_info_ids = DomainInformation.objects.filter(portfolio=portfolio).values_list( + "domain_id", flat=True + ) + user_domain_roles = UserDomainRole.objects.filter(user=member).values_list("domain_id", flat=True) + return domain_info_ids.intersection(user_domain_roles) + elif email: + domain_info_ids = DomainInformation.objects.filter(portfolio=portfolio).values_list( + "domain_id", flat=True + ) + domain_invitations = DomainInvitation.objects.filter(email=email).values_list("domain_id", flat=True) + return domain_info_ids.intersection(domain_invitations) + else: + domain_infos = DomainInformation.objects.filter(portfolio=portfolio) + return domain_infos.values_list("domain_id", flat=True) + logger.warning("Invalid search criteria, returning empty results list") + return [] + + def apply_search(self, queryset, request): + search_term = request.GET.get("search_term") + if search_term: + queryset = queryset.filter(Q(name__icontains=search_term)) + return queryset + + def apply_sorting(self, queryset, request): + sort_by = request.GET.get("sort_by", "name") + order = request.GET.get("order", "asc") + if order == "desc": + sort_by = f"-{sort_by}" + return queryset.order_by(sort_by) + + def serialize_domain(self, domain, user): + suborganization_name = None + try: + domain_info = domain.domain_info + if domain_info: + suborganization = domain_info.sub_organization + if suborganization: + suborganization_name = suborganization.name + except Domain.domain_info.RelatedObjectDoesNotExist: + domain_info = None + logger.debug(f"Issue in domains_json: We could not find domain_info for {domain}") + + # Check if there is a UserDomainRole for this domain and user + user_domain_role_exists = UserDomainRole.objects.filter(domain_id=domain.id, user=user).exists() + view_only = not user_domain_role_exists or domain.state in [Domain.State.DELETED, Domain.State.ON_HOLD] + return { + "id": domain.id, + "name": domain.name, + "expiration_date": domain.expiration_date, + "state": domain.state, + "state_display": domain.state_display(), + "get_state_help_text": domain.get_state_help_text(), + "action_url": reverse("domain", kwargs={"pk": domain.id}), + "action_label": ("View" if view_only else "Manage"), + "svg_icon": ("visibility" if view_only else "settings"), + "domain_info__sub_organization": suborganization_name, + } From 5355b9d3dc7920d75037af117603a6e4cf522443 Mon Sep 17 00:00:00 2001 From: Rachid Mrad Date: Thu, 5 Dec 2024 18:26:05 -0500 Subject: [PATCH 04/20] change col name --- src/registrar/assets/src/js/getgov/table-edit-member-domains.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/assets/src/js/getgov/table-edit-member-domains.js b/src/registrar/assets/src/js/getgov/table-edit-member-domains.js index b0cd8ce9a..706f15186 100644 --- a/src/registrar/assets/src/js/getgov/table-edit-member-domains.js +++ b/src/registrar/assets/src/js/getgov/table-edit-member-domains.js @@ -17,7 +17,7 @@ export class EditMemberDomainsTable extends BaseTable { const domain = dataObject; const row = document.createElement('tr'); row.innerHTML = ` - +
Date: Fri, 6 Dec 2024 12:39:29 -0500 Subject: [PATCH 05/20] updated javascript --- .../js/getgov/table-edit-member-domains.js | 71 ++++++++++++++++++- .../includes/member_domains_edit_table.html | 6 +- 2 files changed, 73 insertions(+), 4 deletions(-) diff --git a/src/registrar/assets/src/js/getgov/table-edit-member-domains.js b/src/registrar/assets/src/js/getgov/table-edit-member-domains.js index 706f15186..e4d76b953 100644 --- a/src/registrar/assets/src/js/getgov/table-edit-member-domains.js +++ b/src/registrar/assets/src/js/getgov/table-edit-member-domains.js @@ -6,6 +6,11 @@ export class EditMemberDomainsTable extends BaseTable { constructor() { super('edit-member-domain'); this.currentSortBy = 'name'; + this.initialDomainAssignments = []; + this.initialDomainAssignmentsOnlyMember = []; + this.addedDomains = []; + this.removedDomains = []; + this.initializeDomainAssignments(); } getBaseUrl() { return document.getElementById("get_member_domains_edit_json_url"); @@ -13,9 +18,49 @@ export class EditMemberDomainsTable extends BaseTable { getDataObjects(data) { return data.domains; } + getDomainAssignmentSearchParams(portfolio) { + let searchParams = new URLSearchParams(); + let emailValue = this.portfolioElement ? this.portfolioElement.getAttribute('data-email') : null; + let memberIdValue = this.portfolioElement ? this.portfolioElement.getAttribute('data-member-id') : null; + let memberOnly = true; + if (portfolio) + searchParams.append("portfolio", portfolio); + if (emailValue) + searchParams.append("email", emailValue); + if (memberIdValue) + searchParams.append("member_id", memberIdValue); + if (memberOnly) + searchParams.append("member_only", memberOnly); + return searchParams; + } + getSearchParams(page, sortBy, order, searchTerm, status, portfolio) { + let searchParams = super.getSearchParams(page, sortBy, order, searchTerm, status, portfolio); + if (this.addedDomains) + searchParams.append("addedDomainIds", this.addedDomains); + if (this.removedDomains) + searchParams.append("removedDomainIds", this.removedDomains); + return searchParams; + } addRow(dataObject, tbody, customTableOptions) { const domain = dataObject; const row = document.createElement('tr'); + //console.log("initialDomainAssignments: " + this.initialDomainAssignments); + //console.log("testing domain: " + domain.id); + let checked = false; + let disabled = false; + if ( + (this.initialDomainAssignments.includes(domain.id) || + this.addedDomains.map(obj => obj.id).includes(domain.id)) && + !this.removedDomains.map(obj => obj.id).includes(domain.id) + ) { + console.log("checked domain: " + domain.id); + checked = true; + } + if (this.initialDomainAssignmentsOnlyMember.includes(domain.id)) { + console.log("disabled domain: " + domain.id); + disabled = true; + } + row.innerHTML = `
@@ -25,6 +70,8 @@ export class EditMemberDomainsTable extends BaseTable { type="checkbox" name="${domain.name}" value="${domain.id}" + ${checked ? 'checked' : ''} + ${disabled ? 'disabled' : ''} />
- diff --git a/src/registrar/templates/includes/modal.html b/src/registrar/templates/includes/modal.html index 00c51cee0..625044585 100644 --- a/src/registrar/templates/includes/modal.html +++ b/src/registrar/templates/includes/modal.html @@ -23,18 +23,24 @@

    - {% if not_form %}
  • + {% if not_form and modal_button %} {{ modal_button }} -
    • - {% else %} -
  • + {% elif modal_button_url and modal_button_text %} + + {{ modal_button_text }} + + {% else %}
    {% csrf_token %} {{ modal_button }}
    -
    • - {% endif %} + {% endif %} +
  • {% comment %} The cancel button the DS form actually triggers a context change in the view, in addition to being a close modal hook {% endcomment %} diff --git a/src/registrar/templates/portfolio_member_domains_edit.html b/src/registrar/templates/portfolio_member_domains_edit.html index 98720ae46..d430e7572 100644 --- a/src/registrar/templates/portfolio_member_domains_edit.html +++ b/src/registrar/templates/portfolio_member_domains_edit.html @@ -44,5 +44,26 @@

    Edit domain assignments

    {% include "includes/member_domains_edit_table.html" %} +
      +
    • + + +
      • +
    • + +
      • +
    +
{% endblock %} From 01e6296ed44cf45676d7c6614a8f987db6935178 Mon Sep 17 00:00:00 2001 From: David Kennedy Date: Fri, 6 Dec 2024 16:25:53 -0500 Subject: [PATCH 11/20] pagination and file cleanup --- .../js/getgov/table-edit-member-domains.js | 2 +- src/registrar/config/urls.py | 1 - .../includes/member_domains_edit_table.html | 4 +- src/registrar/views/__init__.py | 1 - .../views/member_domains_edit_json.py | 161 ------------------ src/registrar/views/member_domains_json.py | 69 +++++++- 6 files changed, 66 insertions(+), 172 deletions(-) delete mode 100644 src/registrar/views/member_domains_edit_json.py diff --git a/src/registrar/assets/src/js/getgov/table-edit-member-domains.js b/src/registrar/assets/src/js/getgov/table-edit-member-domains.js index 44dab50d3..24c34685e 100644 --- a/src/registrar/assets/src/js/getgov/table-edit-member-domains.js +++ b/src/registrar/assets/src/js/getgov/table-edit-member-domains.js @@ -15,7 +15,7 @@ export class EditMemberDomainsTable extends BaseTable { this.initCancelEditDomainAssignmentButton(); } getBaseUrl() { - return document.getElementById("get_member_domains_edit_json_url"); + return document.getElementById("get_member_domains_json_url"); } getDataObjects(data) { return data.domains; diff --git a/src/registrar/config/urls.py b/src/registrar/config/urls.py index 1a13a4556..d906920bf 100644 --- a/src/registrar/config/urls.py +++ b/src/registrar/config/urls.py @@ -383,7 +383,6 @@ path("get-domain-requests-json/", get_domain_requests_json, name="get_domain_requests_json"), path("get-portfolio-members-json/", views.PortfolioMembersJson.as_view(), name="get_portfolio_members_json"), path("get-member-domains-json/", views.PortfolioMemberDomainsJson.as_view(), name="get_member_domains_json"), - path("get-member-domains-edit-json/", views.PortfolioMemberDomainsEditJson.as_view(), name="get_member_domains_edit_json"), ] # Djangooidc strips out context data from that context, so we define a custom error diff --git a/src/registrar/templates/includes/member_domains_edit_table.html b/src/registrar/templates/includes/member_domains_edit_table.html index 325b646cd..198b85093 100644 --- a/src/registrar/templates/includes/member_domains_edit_table.html +++ b/src/registrar/templates/includes/member_domains_edit_table.html @@ -21,8 +21,8 @@ {% endif %} {% comment %} Stores the json endpoint in a url for easier access {% endcomment %} -{% url 'get_member_domains_edit_json' as url %} - +{% url 'get_member_domains_json' as url %} +

diff --git a/src/registrar/views/__init__.py b/src/registrar/views/__init__.py index 10d8acf92..9a9cb7856 100644 --- a/src/registrar/views/__init__.py +++ b/src/registrar/views/__init__.py @@ -20,5 +20,4 @@ from .portfolios import * from .transfer_user import TransferUserView from .member_domains_json import PortfolioMemberDomainsJson -from .member_domains_edit_json import PortfolioMemberDomainsEditJson from .portfolio_members_json import PortfolioMembersJson diff --git a/src/registrar/views/member_domains_edit_json.py b/src/registrar/views/member_domains_edit_json.py deleted file mode 100644 index ddaca563b..000000000 --- a/src/registrar/views/member_domains_edit_json.py +++ /dev/null @@ -1,161 +0,0 @@ -import logging -from django.db import models -from django.http import JsonResponse -from django.core.paginator import Paginator -from django.shortcuts import get_object_or_404 -from django.views import View -from registrar.models import UserDomainRole, Domain, DomainInformation, User -from django.urls import reverse -from django.db.models import Q - -from registrar.models.domain_invitation import DomainInvitation -from registrar.views.utility.mixins import PortfolioMemberDomainsEditPermission - -logger = logging.getLogger(__name__) - - -class PortfolioMemberDomainsEditJson(PortfolioMemberDomainsEditPermission, View): - - def get(self, request): - """Given the current request, - get all domains that are associated with the portfolio, or - associated with the member/invited member""" - - domain_ids = self.get_domain_ids_from_request(request) - - objects = Domain.objects.filter(id__in=domain_ids).select_related("domain_info__sub_organization") - unfiltered_total = objects.count() - - objects = self.apply_search(objects, request) - objects = self.apply_sorting(objects, request) - - paginator = Paginator(objects, 10) - page_number = request.GET.get("page") - page_obj = paginator.get_page(page_number) - - member_id = request.GET.get("member_id") - domains = [self.serialize_domain(domain, member_id, request.user) for domain in page_obj.object_list] - - return JsonResponse( - { - "domains": domains, - "page": page_obj.number, - "num_pages": paginator.num_pages, - "has_previous": page_obj.has_previous(), - "has_next": page_obj.has_next(), - "total": paginator.count, - "unfiltered_total": unfiltered_total, - } - ) - - def get_domain_ids_from_request(self, request): - """Get domain ids from request. - - request.get.email - email address of invited member - request.get.member_id - member id of member - request.get.portfolio - portfolio id of portfolio - request.get.member_only - whether to return only domains associated with member - or to return all domains in the portfolio - """ - portfolio = request.GET.get("portfolio") - email = request.GET.get("email") - member_id = request.GET.get("member_id") - member_only = request.GET.get("member_only", "false").lower() in ["true", "1"] - if member_only: - if member_id: - member = get_object_or_404(User, pk=member_id) - domain_info_ids = DomainInformation.objects.filter(portfolio=portfolio).values_list( - "domain_id", flat=True - ) - user_domain_roles = UserDomainRole.objects.filter(user=member).values_list("domain_id", flat=True) - return domain_info_ids.intersection(user_domain_roles) - elif email: - domain_info_ids = DomainInformation.objects.filter(portfolio=portfolio).values_list( - "domain_id", flat=True - ) - domain_invitations = DomainInvitation.objects.filter(email=email).values_list("domain_id", flat=True) - return domain_info_ids.intersection(domain_invitations) - else: - domain_infos = DomainInformation.objects.filter(portfolio=portfolio) - return domain_infos.values_list("domain_id", flat=True) - logger.warning("Invalid search criteria, returning empty results list") - return [] - - def apply_search(self, queryset, request): - search_term = request.GET.get("search_term") - if search_term: - queryset = queryset.filter(Q(name__icontains=search_term)) - return queryset - - def apply_sorting(self, queryset, request): - # Get the sorting parameters from the request - sort_by = request.GET.get("sort_by", "name") - order = request.GET.get("order", "asc") - # Sort by 'checked' if specified, otherwise by the given field - if sort_by == "checked": - # Get list of checked ids from the request - checked_ids = request.GET.get("checkedDomainIds") - if checked_ids: - # Split the comma-separated string into a list of integers - checked_ids = [int(id.strip()) for id in checked_ids.split(",") if id.strip().isdigit()] - else: - # If no value is passed, set checked_ids to an empty list - checked_ids = [] - # Annotate each object with a 'checked' value based on whether its ID is in checkedIds - queryset = queryset.annotate( - checked=models.Case( - models.When(id__in=checked_ids, then=models.Value(True)), - default=models.Value(False), - output_field=models.BooleanField(), - ) - ) - # Add ordering logic for 'checked' - if order == "desc": - queryset = queryset.order_by("-checked","name") - else: - queryset = queryset.order_by("checked","name") - else: - # Handle other fields as normal - if order == "desc": - sort_by = f"-{sort_by}" - queryset = queryset.order_by(sort_by) - - return queryset - - - def serialize_domain(self, domain, member_id, user): - suborganization_name = None - try: - domain_info = domain.domain_info - if domain_info: - suborganization = domain_info.sub_organization - if suborganization: - suborganization_name = suborganization.name - except Domain.domain_info.RelatedObjectDoesNotExist: - domain_info = None - logger.debug(f"Issue in domains_json: We could not find domain_info for {domain}") - - # Check if there is a UserDomainRole for this domain and user - user_domain_role_exists = UserDomainRole.objects.filter(domain_id=domain.id, user=user).exists() - view_only = not user_domain_role_exists or domain.state in [Domain.State.DELETED, Domain.State.ON_HOLD] - - # Check if the specified member is the only member assigned as manager of domain - only_member_assigned_to_domain = False - if member_id: - member_domain_role_count = UserDomainRole.objects.filter(domain_id=domain.id).count() - member_domain_role_exists = UserDomainRole.objects.filter(domain_id=domain.id, user_id=member_id).exists() - only_member_assigned_to_domain = member_domain_role_exists and member_domain_role_count == 1 - - return { - "id": domain.id, - "name": domain.name, - "member_is_only_manager": only_member_assigned_to_domain, - "expiration_date": domain.expiration_date, - "state": domain.state, - "state_display": domain.state_display(), - "get_state_help_text": domain.get_state_help_text(), - "action_url": reverse("domain", kwargs={"pk": domain.id}), - "action_label": ("View" if view_only else "Manage"), - "svg_icon": ("visibility" if view_only else "settings"), - "domain_info__sub_organization": suborganization_name, - } diff --git a/src/registrar/views/member_domains_json.py b/src/registrar/views/member_domains_json.py index f37afdff0..cfe82251e 100644 --- a/src/registrar/views/member_domains_json.py +++ b/src/registrar/views/member_domains_json.py @@ -1,4 +1,5 @@ import logging +from django.db import models from django.http import JsonResponse from django.core.paginator import Paginator from django.shortcuts import get_object_or_404 @@ -28,11 +29,12 @@ def get(self, request): objects = self.apply_search(objects, request) objects = self.apply_sorting(objects, request) - paginator = Paginator(objects, 10) + paginator = Paginator(objects, self.get_page_size(request)) page_number = request.GET.get("page") page_obj = paginator.get_page(page_number) - domains = [self.serialize_domain(domain, request.user) for domain in page_obj.object_list] + member_id = request.GET.get("member_id") + domains = [self.serialize_domain(domain, member_id, request.user) for domain in page_obj.object_list] return JsonResponse( { @@ -46,6 +48,23 @@ def get(self, request): } ) + def get_page_size(self, request): + """Gets the page size. + + If member_only, need to return the entire result set every time, so need + to set to a very large page size. If not member_only, this can be adjusted + to provide a smaller page size""" + + member_only = request.GET.get("member_only", "false").lower() in ["true", "1"] + if member_only: + # This number needs to remain very high as the entire result set + # must be returned when member_only + return 1000 + else: + # This number can be adjusted if we want to add pagination to the result page + # later + return 1000 + def get_domain_ids_from_request(self, request): """Get domain ids from request. @@ -86,13 +105,42 @@ def apply_search(self, queryset, request): return queryset def apply_sorting(self, queryset, request): + # Get the sorting parameters from the request sort_by = request.GET.get("sort_by", "name") order = request.GET.get("order", "asc") - if order == "desc": - sort_by = f"-{sort_by}" - return queryset.order_by(sort_by) + # Sort by 'checked' if specified, otherwise by the given field + if sort_by == "checked": + # Get list of checked ids from the request + checked_ids = request.GET.get("checkedDomainIds") + if checked_ids: + # Split the comma-separated string into a list of integers + checked_ids = [int(id.strip()) for id in checked_ids.split(",") if id.strip().isdigit()] + else: + # If no value is passed, set checked_ids to an empty list + checked_ids = [] + # Annotate each object with a 'checked' value based on whether its ID is in checkedIds + queryset = queryset.annotate( + checked=models.Case( + models.When(id__in=checked_ids, then=models.Value(True)), + default=models.Value(False), + output_field=models.BooleanField(), + ) + ) + # Add ordering logic for 'checked' + if order == "desc": + queryset = queryset.order_by("-checked","name") + else: + queryset = queryset.order_by("checked","name") + else: + # Handle other fields as normal + if order == "desc": + sort_by = f"-{sort_by}" + queryset = queryset.order_by(sort_by) + + return queryset + - def serialize_domain(self, domain, user): + def serialize_domain(self, domain, member_id, user): suborganization_name = None try: domain_info = domain.domain_info @@ -107,9 +155,18 @@ def serialize_domain(self, domain, user): # Check if there is a UserDomainRole for this domain and user user_domain_role_exists = UserDomainRole.objects.filter(domain_id=domain.id, user=user).exists() view_only = not user_domain_role_exists or domain.state in [Domain.State.DELETED, Domain.State.ON_HOLD] + + # Check if the specified member is the only member assigned as manager of domain + only_member_assigned_to_domain = False + if member_id: + member_domain_role_count = UserDomainRole.objects.filter(domain_id=domain.id).count() + member_domain_role_exists = UserDomainRole.objects.filter(domain_id=domain.id, user_id=member_id).exists() + only_member_assigned_to_domain = member_domain_role_exists and member_domain_role_count == 1 + return { "id": domain.id, "name": domain.name, + "member_is_only_manager": only_member_assigned_to_domain, "expiration_date": domain.expiration_date, "state": domain.state, "state_display": domain.state_display(), From 20f0a492aa28af6a1be38fd1c3793c8d0d0b74b0 Mon Sep 17 00:00:00 2001 From: David Kennedy Date: Fri, 6 Dec 2024 16:36:22 -0500 Subject: [PATCH 12/20] accounting for annotations in figma --- .../includes/member_domains_edit_table.html | 4 ++-- .../templates/includes/member_domains_table.html | 14 +++++--------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/registrar/templates/includes/member_domains_edit_table.html b/src/registrar/templates/includes/member_domains_edit_table.html index 198b85093..4eade2511 100644 --- a/src/registrar/templates/includes/member_domains_edit_table.html +++ b/src/registrar/templates/includes/member_domains_edit_table.html @@ -26,7 +26,7 @@

- Domains assigned to + Edit domains assigned to {% if member %} {{ member.email }} {% else %} @@ -36,7 +36,7 @@

-
+