diff --git a/src/registrar/views/portfolios.py b/src/registrar/views/portfolios.py
index 95d0864ab..0c4b1ff4a 100644
--- a/src/registrar/views/portfolios.py
+++ b/src/registrar/views/portfolios.py
@@ -1,6 +1,4 @@
import logging
-from django.conf import settings
-
from django.http import Http404, JsonResponse
from django.shortcuts import get_object_or_404, redirect, render
from django.urls import reverse
@@ -19,6 +17,7 @@ from registrar.views.utility.permission_views import (
PortfolioDomainsPermissionView,
PortfolioBasePermissionView,
NoPortfolioDomainsPermissionView,
+ PortfolioInvitationCreatePermissionView,
PortfolioMemberDomainsPermissionView,
PortfolioMemberEditPermissionView,
PortfolioMemberPermissionView,
@@ -163,11 +162,21 @@ class PortfolioMemberEditView(PortfolioMemberEditPermissionView, View):
def post(self, request, pk):
portfolio_permission = get_object_or_404(UserPortfolioPermission, pk=pk)
user = portfolio_permission.user
+ is_editing_self = request.user == user
form = self.form_class(request.POST, instance=portfolio_permission)
if form.is_valid():
+ # Check if user is removing their own admin or edit role
+ old_roles = set(portfolio_permission.roles)
+ new_roles = set(form.cleaned_data.get("role", []))
+ removing_admin_role = (
+ is_editing_self
+ and UserPortfolioRoleChoices.ORGANIZATION_ADMIN in old_roles
+ and UserPortfolioRoleChoices.ORGANIZATION_ADMIN not in new_roles
+ )
form.save()
- return redirect("member", pk=pk)
+ messages.success(self.request, "The member access and permission changes have been saved.")
+ return redirect("member", pk=pk) if not removing_admin_role else redirect("home")
return render(
request,
@@ -278,6 +287,7 @@ class PortfolioInvitedMemberEditView(PortfolioMemberEditPermissionView, View):
form = self.form_class(request.POST, instance=portfolio_invitation)
if form.is_valid():
form.save()
+ messages.success(self.request, "The member access and permission changes have been saved.")
return redirect("invitedmember", pk=pk)
return render(
@@ -466,162 +476,44 @@ class PortfolioMembersView(PortfolioMembersPermissionView, View):
return render(request, "portfolio_members.html")
-class NewMemberView(PortfolioMembersPermissionView, FormMixin):
-
+class NewMemberView(PortfolioInvitationCreatePermissionView):
template_name = "portfolio_members_add_new.html"
form_class = portfolioForms.NewMemberForm
- def get_object(self, queryset=None):
- """Get the portfolio object based on the session."""
- portfolio = self.request.session.get("portfolio")
- if portfolio is None:
- raise Http404("No organization found for this user")
- return portfolio
-
def get_form_kwargs(self):
- """Include the instance in the form kwargs."""
+ """Pass request and portfolio to form."""
kwargs = super().get_form_kwargs()
- kwargs["instance"] = self.get_object()
+ kwargs['portfolio'] = self.request.session.get("portfolio")
return kwargs
- def get(self, request, *args, **kwargs):
- """Handle GET requests to display the form."""
- self.object = self.get_object()
- form = self.get_form()
- return self.render_to_response(self.get_context_data(form=form))
+ def get_success_url(self):
+ return reverse("members")
- def post(self, request, *args, **kwargs):
- """Handle POST requests to process form submission."""
- self.object = self.get_object()
- form = self.get_form()
-
- if form.is_valid():
- return self.form_valid(form)
- else:
- return self.form_invalid(form)
-
- def is_ajax(self):
- return self.request.headers.get("X-Requested-With") == "XMLHttpRequest"
+ def form_valid(self, form):
+ """Create portfolio invitation from form data."""
+ if self.is_ajax():
+ return JsonResponse({"is_valid": True})
+
+ requested_email = form.cleaned_data.get("email")
+ messages.success(self.request, f"{requested_email} has been invited.")
+
+ # Create instance using form's mapping method
+ self.object = form.map_cleaned_data_to_instance(
+ form.cleaned_data,
+ PortfolioInvitation(
+ email=form.cleaned_data.get("email"),
+ portfolio=self.request.session.get("portfolio")
+ )
+ )
+ self.object.save()
+
+ messages.success(self.request, f"{self.object.email} has been invited.")
+ return redirect(self.get_success_url())
def form_invalid(self, form):
if self.is_ajax():
- return JsonResponse({"is_valid": False}) # Return a JSON response
- else:
- return super().form_invalid(form) # Handle non-AJAX requests normally
+ return JsonResponse({"is_valid": False})
+ return super().form_invalid(form)
- def form_valid(self, form):
-
- if self.is_ajax():
- return JsonResponse({"is_valid": True}) # Return a JSON response
- else:
- return self.submit_new_member(form)
-
- def get_success_url(self):
- """Redirect to members table."""
- return reverse("members")
-
- def _send_portfolio_invitation_email(self, email: str, requestor: User, add_success=True):
- """Performs the sending of the member invitation email
- email: string- email to send to
- add_success: bool- default True indicates:
- adding a success message to the view if the email sending succeeds
-
- raises EmailSendingError
- """
-
- # Set a default email address to send to for staff
- requestor_email = settings.DEFAULT_FROM_EMAIL
-
- # Check if the email requestor has a valid email address
- if not requestor.is_staff and requestor.email is not None and requestor.email.strip() != "":
- requestor_email = requestor.email
- elif not requestor.is_staff:
- messages.error(self.request, "Can't send invitation email. No email is associated with your account.")
- logger.error(
- f"Can't send email to '{email}' on domain '{self.object}'."
- f"No email exists for the requestor '{requestor.username}'.",
- exc_info=True,
- )
- return None
-
- # Check to see if an invite has already been sent
- try:
- invite = PortfolioInvitation.objects.get(email=email, portfolio=self.object)
- if invite: # We have an existin invite
- # check if the invite has already been accepted
- if invite.status == PortfolioInvitation.PortfolioInvitationStatus.RETRIEVED:
- add_success = False
- messages.warning(
- self.request,
- f"{email} is already a manager for this portfolio.",
- )
- else:
- add_success = False
- # it has been sent but not accepted
- messages.warning(self.request, f"{email} has already been invited to this portfolio")
- return
- except Exception as err:
- logger.error(f"_send_portfolio_invitation_email() => An error occured: {err}")
-
- try:
- logger.debug("requestor email: " + requestor_email)
-
- # send_templated_email(
- # "emails/portfolio_invitation.txt",
- # "emails/portfolio_invitation_subject.txt",
- # to_address=email,
- # context={
- # "portfolio": self.object,
- # "requestor_email": requestor_email,
- # },
- # )
- except EmailSendingError as exc:
- logger.warn(
- "Could not sent email invitation to %s for domain %s",
- email,
- self.object,
- exc_info=True,
- )
- raise EmailSendingError("Could not send email invitation.") from exc
- else:
- if add_success:
- messages.success(self.request, f"{email} has been invited.")
-
- def _make_invitation(self, email_address: str, requestor: User, add_success=True):
- """Make a Member invitation for this email and redirect with a message."""
- try:
- self._send_portfolio_invitation_email(email=email_address, requestor=requestor, add_success=add_success)
- except EmailSendingError:
- logger.warn(
- "Could not send email invitation (EmailSendingError)",
- self.object,
- exc_info=True,
- )
- messages.warning(self.request, "Could not send email invitation.")
- except Exception:
- logger.warn(
- "Could not send email invitation (Other Exception)",
- self.object,
- exc_info=True,
- )
- messages.warning(self.request, "Could not send email invitation.")
- else:
- # (NOTE: only create a MemberInvitation if the e-mail sends correctly)
- PortfolioInvitation.objects.get_or_create(email=email_address, portfolio=self.object)
- return redirect(self.get_success_url())
-
- def submit_new_member(self, form):
- """Add the specified user as a member
- for this portfolio.
- Throws EmailSendingError."""
- requested_email = form.cleaned_data["email"]
- requestor = self.request.user
-
- requested_user = User.objects.filter(email=requested_email).first()
- permission_exists = UserPortfolioPermission.objects.filter(user=requested_user, portfolio=self.object).exists()
- if not requested_user or not permission_exists:
- return self._make_invitation(requested_email, requestor)
- else:
- if permission_exists:
- messages.warning(self.request, "User is already a member of this portfolio.")
- return redirect(self.get_success_url())
+ def is_ajax(self):
+ return self.request.headers.get("X-Requested-With") == "XMLHttpRequest"
diff --git a/src/registrar/views/utility/__init__.py b/src/registrar/views/utility/__init__.py
index 6798eb4ee..fbf44fda1 100644
--- a/src/registrar/views/utility/__init__.py
+++ b/src/registrar/views/utility/__init__.py
@@ -9,5 +9,6 @@ from .permission_views import (
PortfolioMembersPermission,
DomainRequestPortfolioViewonlyView,
DomainInvitationPermissionCancelView,
+ PortfolioInvitationCreatePermissionView,
)
from .api_views import get_senior_official_from_federal_agency_json
diff --git a/src/registrar/views/utility/mixins.py b/src/registrar/views/utility/mixins.py
index 8a3d53f09..6eeba878f 100644
--- a/src/registrar/views/utility/mixins.py
+++ b/src/registrar/views/utility/mixins.py
@@ -466,6 +466,23 @@ class PortfolioBasePermission(PermissionsLoginMixin):
return self.request.user.is_org_user(self.request)
+class PortfolioInvitationCreatePermission(PortfolioBasePermission):
+ """Permission mixin that redirects to portfolio pages if user
+ has access, otherwise 403"""
+
+ def has_permission(self):
+ """Check if this user has access to this portfolio.
+
+ The user is in self.request.user and the portfolio can be looked
+ up from the portfolio's primary key in self.kwargs["pk"]
+ """
+ has_perm = super().has_permission()
+ if not has_perm:
+ return False
+
+ portfolio = self.request.session.get("portfolio")
+ return self.request.user.has_edit_members_portfolio_permission(portfolio)
+
class PortfolioDomainsPermission(PortfolioBasePermission):
"""Permission mixin that allows access to portfolio domain pages if user
has access, otherwise 403"""
diff --git a/src/registrar/views/utility/permission_views.py b/src/registrar/views/utility/permission_views.py
index 115b2754f..2ea8a9d75 100644
--- a/src/registrar/views/utility/permission_views.py
+++ b/src/registrar/views/utility/permission_views.py
@@ -1,9 +1,10 @@
"""View classes that enforce authorization."""
import abc # abstract base class
-
+from django.views.generic.edit import CreateView
from django.views.generic import DetailView, DeleteView, TemplateView, UpdateView
from registrar.models import Domain, DomainRequest, DomainInvitation, Portfolio
+from registrar.models.portfolio_invitation import PortfolioInvitation
from registrar.models.user import User
from registrar.models.user_domain_role import UserDomainRole
@@ -15,6 +16,7 @@ from .mixins import (
DomainRequestWizardPermission,
PortfolioDomainRequestsPermission,
PortfolioDomainsPermission,
+ PortfolioInvitationCreatePermission,
PortfolioMemberDomainsPermission,
PortfolioMemberEditPermission,
UserDeleteDomainRolePermission,
@@ -224,6 +226,25 @@ class PortfolioBasePermissionView(PortfolioBasePermission, DetailView, abc.ABC):
raise NotImplementedError
+class PortfolioInvitationCreatePermissionView(PortfolioInvitationCreatePermission, CreateView, abc.ABC):
+ """Abstract base view for portfolio views that enforces permissions.
+
+ This abstract view cannot be instantiated. Actual views must specify
+ `template_name`.
+ """
+
+ # DetailView property for what model this is viewing
+ model = PortfolioInvitation
+ # variable name in template context for the model object
+ context_object_name = "portfolio_invitation"
+
+ # Abstract property enforces NotImplementedError on an attribute.
+ @property
+ @abc.abstractmethod
+ def template_name(self):
+ raise NotImplementedError
+
+
class PortfolioDomainsPermissionView(PortfolioDomainsPermission, PortfolioBasePermissionView, abc.ABC):
"""Abstract base view for portfolio domains views that enforces permissions.
From 6707205800b5165d2bfbafffad14595e7739cfae Mon Sep 17 00:00:00 2001
From: Erin Song <121973038+erinysong@users.noreply.github.com>
Date: Thu, 12 Dec 2024 13:22:30 -0800
Subject: [PATCH 069/135] Revert Pipefile
---
src/Pipfile.lock | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Pipfile.lock b/src/Pipfile.lock
index 82d770520..33b858314 100644
--- a/src/Pipfile.lock
+++ b/src/Pipfile.lock
@@ -1793,7 +1793,7 @@
"sha256:2a06f242f4ba0cc563444ca3d1998959447477363a2d7e9b8b4d75d35cfd1669"
],
"markers": "python_full_version >= '3.8.0'",
- "version": "==3.0.1"
+ "version": "==3.0.0"
},
"webob": {
"hashes": [
From 4af7747436bca4d9e4ccd70d609083752d1d6dac Mon Sep 17 00:00:00 2001
From: Erin Song <121973038+erinysong@users.noreply.github.com>
Date: Thu, 12 Dec 2024 13:26:47 -0800
Subject: [PATCH 070/135] Bump waitress to 3.0.1
---
src/Pipfile.lock | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/Pipfile.lock b/src/Pipfile.lock
index 33b858314..56daf5db5 100644
--- a/src/Pipfile.lock
+++ b/src/Pipfile.lock
@@ -1789,11 +1789,12 @@
},
"waitress": {
"hashes": [
- "sha256:005da479b04134cdd9dd602d1ee7c49d79de0537610d653674cc6cbde222b8a1",
- "sha256:2a06f242f4ba0cc563444ca3d1998959447477363a2d7e9b8b4d75d35cfd1669"
+ "sha256:26cdbc593093a15119351690752c99adc13cbc6786d75f7b6341d1234a3730ac",
+ "sha256:ef0c1f020d9f12a515c4ec65c07920a702613afcad1dbfdc3bcec256b6c072b3"
],
- "markers": "python_full_version >= '3.8.0'",
- "version": "==3.0.0"
+ "index": "pypi",
+ "markers": "python_full_version >= '3.9.0'",
+ "version": "==3.0.1"
},
"webob": {
"hashes": [
From 1fb8b222c496c3f6310eee10b72398aee85aae79 Mon Sep 17 00:00:00 2001
From: matthewswspence
Date: Thu, 12 Dec 2024 15:31:40 -0600
Subject: [PATCH 071/135] pushing changes to pull on another device
---
src/registrar/models/domain.py | 8 --------
src/registrar/tests/test_models_domain.py | 4 ----
2 files changed, 12 deletions(-)
diff --git a/src/registrar/models/domain.py b/src/registrar/models/domain.py
index 245c82f7f..b2626bbe1 100644
--- a/src/registrar/models/domain.py
+++ b/src/registrar/models/domain.py
@@ -1084,14 +1084,6 @@ class Domain(TimeStampedModel, DomainHelper):
request = commands.DeleteDomain(name=self.name)
registry.send(request, cleaned=True)
- logger.debug("Deleting registrant contact for %s", self.name)
- registrant_id = self.registrant_contact.registry_id
- logger.debug("setting default registrant contact")
- self._add_registrant_to_existing_domain(self.get_default_registrant_contact())
- logger.debug("deleting registrant contact %s from registry", registrant_id)
- deleteRegistrant = commands.DeleteContact(id=registrant_id)
- registry.send(deleteRegistrant, cleaned=True)
-
def __str__(self) -> str:
return self.name
diff --git a/src/registrar/tests/test_models_domain.py b/src/registrar/tests/test_models_domain.py
index d6a24e2bd..9e54a6e5f 100644
--- a/src/registrar/tests/test_models_domain.py
+++ b/src/registrar/tests/test_models_domain.py
@@ -2754,10 +2754,6 @@ class TestAnalystDelete(MockEppLib):
commands.DeleteDomain(name='freeman.gov'),
cleaned=True,
),
- call(
- commands.DeleteContact(id='regContact'),
- cleaned=True,
- ),
],
any_order=True,
)
From 63c2b7907f1a2a7f858eab480644f37ff78329c8 Mon Sep 17 00:00:00 2001
From: Matthew Spence
Date: Thu, 12 Dec 2024 15:33:50 -0600
Subject: [PATCH 072/135] clean up
---
src/registrar/models/domain.py | 5 -----
src/registrar/tests/test_models_domain.py | 6 +++---
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/src/registrar/models/domain.py b/src/registrar/models/domain.py
index b2626bbe1..191b6f143 100644
--- a/src/registrar/models/domain.py
+++ b/src/registrar/models/domain.py
@@ -1041,7 +1041,6 @@ class Domain(TimeStampedModel, DomainHelper):
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))
- logger.debug("Checking if any subdomains are in use by another domain")
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)
@@ -1049,7 +1048,6 @@ class Domain(TimeStampedModel, DomainHelper):
code=ErrorCode.OBJECT_ASSOCIATION_PROHIBITS_OPERATION,
note=f"Host {host.name} is in use by {host.domain}",
)
- logger.debug("No subdomains are in use by another domain")
(
deleted_values,
@@ -1071,12 +1069,9 @@ class Domain(TimeStampedModel, DomainHelper):
logger.debug("Deleting non-registrant contacts for %s", self.name)
contacts = PublicContact.objects.filter(domain=self)
- logger.debug("contacts %s", contacts)
for contact in contacts:
if contact.contact_type != PublicContact.ContactTypeChoices.REGISTRANT:
- logger.debug("removing contact %s from domain %s", contact.registry_id, self.name)
self._update_domain_with_contact(contact, rem=True)
- logger.debug("deleting contact %s from registry", contact.registry_id)
request = commands.DeleteContact(contact.registry_id)
registry.send(request, cleaned=True)
diff --git a/src/registrar/tests/test_models_domain.py b/src/registrar/tests/test_models_domain.py
index 9e54a6e5f..115351c20 100644
--- a/src/registrar/tests/test_models_domain.py
+++ b/src/registrar/tests/test_models_domain.py
@@ -2641,7 +2641,7 @@ class TestAnalystDelete(MockEppLib):
# Cache should be invalidated
self.assertEqual(self.domain._cache, {})
- # @less_console_noise_decorator
+ @less_console_noise_decorator
def test_deletion_is_unsuccessful(self):
"""
Scenario: Domain deletion is unsuccessful
@@ -2665,7 +2665,7 @@ class TestAnalystDelete(MockEppLib):
# State should not have changed
self.assertEqual(domain.state, Domain.State.ON_HOLD)
- # @less_console_noise_decorator
+ @less_console_noise_decorator
def test_deletion_with_host_and_contacts(self):
"""
Scenario: Domain with related Host and Contacts is Deleted
@@ -2763,7 +2763,7 @@ class TestAnalystDelete(MockEppLib):
# State should have changed
self.assertEqual(self.domain_with_contacts.state, Domain.State.DELETED)
- # @less_console_noise_decorator
+ @less_console_noise_decorator
def test_deletion_ready_fsm_failure(self):
"""
Scenario: Domain deletion is unsuccessful due to FSM rules
From f6e95cc4f8cf811d8c7e0721778c012404a5f20d Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Thu, 12 Dec 2024 15:14:05 -0700
Subject: [PATCH 073/135] Add stub for email adding
---
src/registrar/assets/src/js/getgov/main.js | 2 +-
.../assets/src/js/getgov/portfolio-member-page.js | 15 +++++++++------
src/registrar/forms/portfolio.py | 14 ++++++--------
.../templates/portfolio_member_permissions.html | 4 ++--
src/registrar/views/portfolios.py | 14 +++++++++-----
5 files changed, 27 insertions(+), 22 deletions(-)
diff --git a/src/registrar/assets/src/js/getgov/main.js b/src/registrar/assets/src/js/getgov/main.js
index 4eb1534a5..2e789e965 100644
--- a/src/registrar/assets/src/js/getgov/main.js
+++ b/src/registrar/assets/src/js/getgov/main.js
@@ -39,4 +39,4 @@ initPortfolioNewMemberPageToggle();
initAddNewMemberPageListeners();
// Init all other portfolio member pages
-initPortfolioMemberPage();
\ No newline at end of file
+initPortfolioMemberPage();
diff --git a/src/registrar/assets/src/js/getgov/portfolio-member-page.js b/src/registrar/assets/src/js/getgov/portfolio-member-page.js
index 3d5cc3609..aeca5d1f6 100644
--- a/src/registrar/assets/src/js/getgov/portfolio-member-page.js
+++ b/src/registrar/assets/src/js/getgov/portfolio-member-page.js
@@ -57,10 +57,10 @@ export function initAddNewMemberPageListeners() {
}
// Hookup the radio elements
hookupRadioTogglerListener(
- 'member_access_level',
+ 'role',
{
- 'admin': 'new-member-admin-permissions',
- 'basic': 'new-member-basic-permissions'
+ 'organization_admin': 'new-member-admin-permissions',
+ 'organization_basic': 'new-member-basic-permissions'
}
);
@@ -115,6 +115,8 @@ export function initAddNewMemberPageListeners() {
// Get all permission sections (divs with h3 and radio inputs)
const permissionSections = document.querySelectorAll(`#${permission_details_div_id} > h3`);
+ console.log(`what is the id? ${permission_details_div_id}`)
+ console.log(`what is the permissionSections? ${permissionSections}`)
permissionSections.forEach(section => {
// Find the element text
@@ -122,17 +124,18 @@ export function initAddNewMemberPageListeners() {
// Find the associated radio buttons container (next fieldset)
const fieldset = section.nextElementSibling;
-
+ console.log(`what is the fieldset? ${fieldset}`)
if (fieldset && fieldset.tagName.toLowerCase() === 'fieldset') {
// Get the selected radio button within this fieldset
const selectedRadio = fieldset.querySelector('input[type="radio"]:checked');
-
+ console.log(`what is the selectedRadio? ${selectedRadio}`)
// If a radio button is selected, get its label text
let selectedPermission = "No permission selected";
if (selectedRadio) {
const label = fieldset.querySelector(`label[for="${selectedRadio.id}"]`);
selectedPermission = label ? label.textContent : "No permission selected";
}
+ console.log(`what is the selectedPermission? ${selectedPermission}`)
// Create new elements for the modal content
const titleElement = document.createElement("h4");
@@ -198,4 +201,4 @@ export function initPortfolioMemberPage() {
}
)
});
-}
\ No newline at end of file
+}
diff --git a/src/registrar/forms/portfolio.py b/src/registrar/forms/portfolio.py
index f159e962f..135ddd838 100644
--- a/src/registrar/forms/portfolio.py
+++ b/src/registrar/forms/portfolio.py
@@ -364,16 +364,14 @@ class NewMemberForm(BasePortfolioMemberForm):
cleaned_data["email"] = email_value.lower()
if email_value:
- # Check if user exists
- requested_user = User.objects.filter(email=email_value, email__isnull=False).first()
- if not requested_user:
- raise forms.ValidationError("User does not exist.")
-
# Check if user is already a member
- if UserPortfolioPermission.objects.filter(user=requested_user, portfolio=self.portfolio).exists():
- raise forms.ValidationError("User is already a member of this portfolio.")
+ if UserPortfolioPermission.objects.filter(user__email=email_value, portfolio=self.portfolio).exists():
+ self.add_error("email", "User is already a member of this portfolio.")
+
+ if PortfolioInvitation.objects.filter(email=email_value, portfolio=self.portfolio).exists():
+ self.add_error("email", "An invitation already exists for this user.")
##########################################
- # TODO: future ticket
+ # TODO: #3019
# (invite new member)
##########################################
# Check for an existing user (if there isn't any, send an invite)
diff --git a/src/registrar/templates/portfolio_member_permissions.html b/src/registrar/templates/portfolio_member_permissions.html
index 454738460..7e3eb3189 100644
--- a/src/registrar/templates/portfolio_member_permissions.html
+++ b/src/registrar/templates/portfolio_member_permissions.html
@@ -89,7 +89,7 @@
-
+
Admin access permissions
Member permissions available for admin-level acccess.
@@ -110,7 +110,7 @@
-
+
Basic member permissions
Member permissions available for basic-level acccess.
diff --git a/src/registrar/views/portfolios.py b/src/registrar/views/portfolios.py
index 0c4b1ff4a..a03ef2b4a 100644
--- a/src/registrar/views/portfolios.py
+++ b/src/registrar/views/portfolios.py
@@ -493,10 +493,11 @@ class NewMemberView(PortfolioInvitationCreatePermissionView):
"""Create portfolio invitation from form data."""
if self.is_ajax():
return JsonResponse({"is_valid": True})
-
- requested_email = form.cleaned_data.get("email")
- messages.success(self.request, f"{requested_email} has been invited.")
-
+
+ # TODO: #3019
+ # requested_email = form.cleaned_data.get("email")
+ # self.send_portfolio_invitation_email(requested_email)
+
# Create instance using form's mapping method
self.object = form.map_cleaned_data_to_instance(
form.cleaned_data,
@@ -506,10 +507,13 @@ class NewMemberView(PortfolioInvitationCreatePermissionView):
)
)
self.object.save()
-
messages.success(self.request, f"{self.object.email} has been invited.")
return redirect(self.get_success_url())
+ # TODO: #3019
+ # def send_portfolio_invitation_email(self, email):
+ # pass
+
def form_invalid(self, form):
if self.is_ajax():
return JsonResponse({"is_valid": False})
From 2d0c4e7b1da00e66dd8f208235b60b592a778149 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Thu, 12 Dec 2024 15:40:36 -0700
Subject: [PATCH 074/135] Update portfolios.py
---
src/registrar/views/portfolios.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/registrar/views/portfolios.py b/src/registrar/views/portfolios.py
index a03ef2b4a..762de36ca 100644
--- a/src/registrar/views/portfolios.py
+++ b/src/registrar/views/portfolios.py
@@ -494,9 +494,11 @@ class NewMemberView(PortfolioInvitationCreatePermissionView):
if self.is_ajax():
return JsonResponse({"is_valid": True})
- # TODO: #3019
+ # TODO: #3019 - this will probably have to be a small try/catch. Stub for posterity.
# requested_email = form.cleaned_data.get("email")
- # self.send_portfolio_invitation_email(requested_email)
+ # send_success = self.send_portfolio_invitation_email(requested_email)
+ # if not send_success:
+ # return
# Create instance using form's mapping method
self.object = form.map_cleaned_data_to_instance(
From 579ae0296045d67b95bbb616308b5e3be376ccac Mon Sep 17 00:00:00 2001
From: CocoByte
Date: Thu, 12 Dec 2024 20:08:34 -0700
Subject: [PATCH 075/135] First pass through updates
---
src/registrar/admin.py | 8 ++++----
src/registrar/templates/includes/header_basic.html | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/registrar/admin.py b/src/registrar/admin.py
index 17f3fd292..0a2621c54 100644
--- a/src/registrar/admin.py
+++ b/src/registrar/admin.py
@@ -1948,6 +1948,7 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
ElectionOfficeFilter,
"rejection_reason",
InvestigatorFilter,
+ "portfolio"
)
# Search
@@ -1956,8 +1957,10 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
"creator__email",
"creator__first_name",
"creator__last_name",
+ "converted_organization_name"
+
]
- search_help_text = "Search by domain or creator."
+ search_help_text = "Search by domain, creator, or organization name."
fieldsets = [
(
@@ -2123,9 +2126,6 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
"cisa_representative_first_name",
"cisa_representative_last_name",
"cisa_representative_email",
- "requested_suborganization",
- "suborganization_city",
- "suborganization_state_territory",
]
autocomplete_fields = [
diff --git a/src/registrar/templates/includes/header_basic.html b/src/registrar/templates/includes/header_basic.html
index 3f8b4a2fb..e42b2529b 100644
--- a/src/registrar/templates/includes/header_basic.html
+++ b/src/registrar/templates/includes/header_basic.html
@@ -1,7 +1,7 @@
{% load static %}