diff --git a/src/registrar/assets/sass/_theme/_tooltips.scss b/src/registrar/assets/sass/_theme/_tooltips.scss index 177809615..f0abf915d 100644 --- a/src/registrar/assets/sass/_theme/_tooltips.scss +++ b/src/registrar/assets/sass/_theme/_tooltips.scss @@ -1,5 +1,4 @@ @use "uswds-core" as *; -@use "cisa_colors" as *; // Only apply this custom wrapping to desktop @@ -29,4 +28,4 @@ #extended-logo .usa-tooltip__body { font-weight: 400 !important; -} \ No newline at end of file +} diff --git a/src/registrar/management/commands/create_federal_portfolio.py b/src/registrar/management/commands/create_federal_portfolio.py index 4f715d1b7..cf9339bec 100644 --- a/src/registrar/management/commands/create_federal_portfolio.py +++ b/src/registrar/management/commands/create_federal_portfolio.py @@ -256,10 +256,3 @@ class Command(BaseCommand): DomainInformation.objects.bulk_update(domain_infos, ["portfolio", "sub_organization"]) message = f"Added portfolio '{portfolio}' to {len(domain_infos)} domains" TerminalHelper.colorful_logger(logger.info, TerminalColors.OKGREEN, message) - - def handle_portfolio_members(self, portfolio: Portfolio, federal_agency: FederalAgency): - """ - Associate portfolio with members for a federal agency. - Updates all relevant member records. - """ - # TODO: future ticket? diff --git a/src/registrar/management/commands/utility/terminal_helper.py b/src/registrar/management/commands/utility/terminal_helper.py index d5ee478f7..fa7cde683 100644 --- a/src/registrar/management/commands/utility/terminal_helper.py +++ b/src/registrar/management/commands/utility/terminal_helper.py @@ -7,6 +7,7 @@ from django.db.models.manager import BaseManager from typing import List from registrar.utility.enums import LogCode + logger = logging.getLogger(__name__) diff --git a/src/registrar/templates/includes/members_table.html b/src/registrar/templates/includes/members_table.html index 78f126a09..307bfcbf2 100644 --- a/src/registrar/templates/includes/members_table.html +++ b/src/registrar/templates/includes/members_table.html @@ -40,8 +40,9 @@ + {% comment %} - {% if portfolio_members_count and portfolio_members_count > 0 %} + {% if portfolio_members and portfolio_members|length > 0 %} {% endif %} + {% endcomment %} {% if portfolio %} @@ -188,19 +190,6 @@ - {% include "includes/members_table.html" with portfolio=portfolio portfolio_members_count=portfolio_members_count %} + {% include "includes/members_table.html" with portfolio=portfolio %} {% endblock %} diff --git a/src/registrar/tests/test_reports.py b/src/registrar/tests/test_reports.py index d4c0f2ab5..797592806 100644 --- a/src/registrar/tests/test_reports.py +++ b/src/registrar/tests/test_reports.py @@ -356,11 +356,6 @@ class ExportDataTest(MockDbForIndividualTests, MockEppLib): self.assertIn(self.domain_3.name, csv_content) self.assertNotIn(self.domain_2.name, csv_content) - # Test the output for readonly admin - # portfolio_permission.roles = [UserPortfolioRoleChoices.ORGANIZATION_ADMIN_READ_ONLY] - # portfolio_permission.save() - # portfolio_permission.refresh_from_db() - # Get the csv content csv_content = self._run_domain_data_type_user_export(request) self.assertIn(self.domain_1.name, csv_content) diff --git a/src/registrar/views/portfolio_members_json.py b/src/registrar/views/portfolio_members_json.py index 7a06dd9fb..587caba94 100644 --- a/src/registrar/views/portfolio_members_json.py +++ b/src/registrar/views/portfolio_members_json.py @@ -43,7 +43,6 @@ def get_portfolio_members_json(request): for member in page_obj.object_list ] - # DEVELOPER'S NOTE (9-24-24): # If you're wondering where these JSON values are used, check out the class "MembersTable" # in get-gov.js (specifically the "loadTable" function). # @@ -68,9 +67,6 @@ def get_portfolio_members_json(request): ) else: - # This was added to handle NoneType error - # In other examples of we assume there will never be zero entries returned...which is *fine*...until - # something goes wrong. return JsonResponse( { "members": [], diff --git a/src/registrar/views/portfolios.py b/src/registrar/views/portfolios.py index 54438964a..6d29d9006 100644 --- a/src/registrar/views/portfolios.py +++ b/src/registrar/views/portfolios.py @@ -61,7 +61,6 @@ class PortfolioMembersView(PortfolioMembersPermissionView, View): all_members = User.objects.filter(id__in=member_ids) context["portfolio_members"] = all_members - context["portfolio_members_count"] = all_members.count() return render(request, "portfolio_members.html", context)