From cd45c4a58fe303d45de4d39ddfbbfa9f646fa6ab Mon Sep 17 00:00:00 2001 From: Rebecca Hsieh Date: Tue, 22 Oct 2024 14:37:02 -0700 Subject: [PATCH] Remove extraneous imports --- src/registrar/assets/js/get-gov.js | 8 ++++---- src/registrar/config/urls.py | 2 +- src/registrar/views/portfolio_members_json.py | 14 ++++++++++++-- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/src/registrar/assets/js/get-gov.js b/src/registrar/assets/js/get-gov.js index a775347a3..613318cfe 100644 --- a/src/registrar/assets/js/get-gov.js +++ b/src/registrar/assets/js/get-gov.js @@ -1966,7 +1966,7 @@ class MembersTable extends LoadTableBase { let cancelInvitationButton = isMemberInvited ? "Cancel invitation" : "Remove member"; // TODO: Create a function to fetch how many domains the member MANAGES - // Created get_user_domain_count figure out how to call here and maybe view? + // Created get_user_domain_count figure out how to call here and maybe // let modalHeading = ''; // let modalDescription = ''; // If member manages 1 or more domains: @@ -1979,11 +1979,11 @@ class MembersTable extends LoadTableBase { // modalDescription = `They will no longer be able to access this organization. \n // This action cannot be undone.`; - const modalSubmit = ` + const modalSubmit = g` + name="delete-member">Yes, remove from organizaion ` const modal = document.createElement('div'); @@ -2180,7 +2180,7 @@ class MembersTable extends LoadTableBase { this.currentSearchTerm = searchTerm; }) .catch(error => console.error('Error fetching members:', error)); - } + } } diff --git a/src/registrar/config/urls.py b/src/registrar/config/urls.py index cd4251527..cb4e32c4d 100644 --- a/src/registrar/config/urls.py +++ b/src/registrar/config/urls.py @@ -26,7 +26,7 @@ from registrar.views.report_views import ( # --jsons from registrar.views.domain_requests_json import get_domain_requests_json from registrar.views.domains_json import get_domains_json -from registrar.views.portfolio_members_json import get_portfolio_members_json, get_user_domain_count +from registrar.views.portfolio_members_json import get_portfolio_members_json # , get_user_domain_count from registrar.views.utility.api_views import ( get_senior_official_from_federal_agency_json, get_federal_and_portfolio_types_from_federal_agency_json, diff --git a/src/registrar/views/portfolio_members_json.py b/src/registrar/views/portfolio_members_json.py index 8ed43e33d..e9af0adc3 100644 --- a/src/registrar/views/portfolio_members_json.py +++ b/src/registrar/views/portfolio_members_json.py @@ -9,8 +9,9 @@ from django.db.models.functions import Cast from registrar.models.portfolio_invitation import PortfolioInvitation from registrar.models.user_portfolio_permission import UserPortfolioPermission from registrar.models.utility.portfolio_helper import UserPortfolioRoleChoices -from registrar.models import DomainInformation, UserDomainRole -from .models import User + +# from registrar.models import DomainInformation, UserDomainRole +# from .models import User @login_required @@ -155,6 +156,15 @@ def serialize_members(request, portfolio, item, user): view_only = not user.has_edit_members_portfolio_permission(portfolio) or not user_can_edit_other_users + # We only need to call user_portfolio_permissions.get_managed_domains_count() + # What does it do: counts of domain by a specific user for the organization it's in + + # For in progress requests: user.get_active_requests_count() + # If they're is_admin AND user_portfolio_permissions.get_managed_domains_count() == 1 + # Portfolio == Organization + # Question: Can a ORGANIZATION_ADMIN also be a SUBORGANIZATION_ADMIN? + # Question: Does SUBORGANIZATION_ADMIN exist? + is_admin = UserPortfolioRoleChoices.ORGANIZATION_ADMIN in (item.get("roles") or []) action_url = reverse("member" if item["source"] == "permission" else "invitedmember", kwargs={"pk": item["id"]})