mirror of
https://github.com/cisagov/manage.get.gov.git
synced 2025-07-22 10:46:06 +02:00
remove stray char (keyboard error?)
This commit is contained in:
parent
e0223e17b9
commit
38a3d38d0f
2 changed files with 3 additions and 9 deletions
|
@ -1876,7 +1876,7 @@ class TestPortfolio(WebTest):
|
||||||
portfolio=self.portfolio,
|
portfolio=self.portfolio,
|
||||||
roles=[UserPortfolioRoleChoices.ORGANIZATION_MEMBER],
|
roles=[UserPortfolioRoleChoices.ORGANIZATION_MEMBER],
|
||||||
)
|
)
|
||||||
e with patch("django.contrib.messages.success") as mock_success:
|
with patch("django.contrib.messages.success") as mock_success:
|
||||||
self.client.force_login(self.user)
|
self.client.force_login(self.user)
|
||||||
response = self.client.post(
|
response = self.client.post(
|
||||||
reverse("invitedmember-delete", kwargs={"pk": invitation.pk}),
|
reverse("invitedmember-delete", kwargs={"pk": invitation.pk}),
|
||||||
|
|
|
@ -548,7 +548,7 @@ class NewMemberView(PortfolioMembersPermissionView, FormMixin):
|
||||||
# Check to see if an invite has already been sent
|
# Check to see if an invite has already been sent
|
||||||
try:
|
try:
|
||||||
invite = PortfolioInvitation.objects.get(email=email, portfolio=self.object)
|
invite = PortfolioInvitation.objects.get(email=email, portfolio=self.object)
|
||||||
if invite: # We have an existin invite
|
if invite: # We have an existin invite
|
||||||
# check if the invite has already been accepted
|
# check if the invite has already been accepted
|
||||||
if invite.status == PortfolioInvitation.PortfolioInvitationStatus.RETRIEVED:
|
if invite.status == PortfolioInvitation.PortfolioInvitationStatus.RETRIEVED:
|
||||||
add_success = False
|
add_success = False
|
||||||
|
@ -621,18 +621,12 @@ class NewMemberView(PortfolioMembersPermissionView, FormMixin):
|
||||||
requested_user = User.objects.filter(email=requested_email).first()
|
requested_user = User.objects.filter(email=requested_email).first()
|
||||||
permission_exists = UserPortfolioPermission.objects.filter(user=requested_user, portfolio=self.object).exists()
|
permission_exists = UserPortfolioPermission.objects.filter(user=requested_user, portfolio=self.object).exists()
|
||||||
if not requested_user or not permission_exists:
|
if not requested_user or not permission_exists:
|
||||||
return self._make_invitation(requested_email, requestor)
|
return self._make_invitation(requested_email, requestor)
|
||||||
else:
|
else:
|
||||||
if permission_exists:
|
if permission_exists:
|
||||||
messages.warning(self.request, "User is already a member of this portfolio.")
|
messages.warning(self.request, "User is already a member of this portfolio.")
|
||||||
return redirect(self.get_success_url())
|
return redirect(self.get_success_url())
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# look up a user with that email
|
# look up a user with that email
|
||||||
try:
|
try:
|
||||||
requested_user = User.objects.get(email=requested_email)
|
requested_user = User.objects.get(email=requested_email)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue