zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-08-06 01:35:22 +02:00
Code Issues Projects Releases Packages Wiki Activity

Add delete

Browse source
This commit is contained in:
zandercymatics 2024-01-04 11:39:47 -07:00
parent 64687ea786
commit 1710c902da
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
2 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/registrar/views/domain.py
View file

@ -33,7 +33,7 @@ from registrar.utility.errors import (
SecurityEmailErrorCodes,
)
from registrar.models.utility.contact_error import ContactError
from registrar.views.utility.permission_views import UserDomainRolePermissionView
from registrar.views.utility.permission_views import UserDomainRolePermissionDeleteView, UserDomainRolePermissionView
from ..forms import (
ContactForm,
@ -756,11 +756,17 @@ class DomainInvitationDeleteView(DomainInvitationPermissionDeleteView, SuccessMe
return f"Successfully canceled invitation for {self.object.email}."
class DomainDeleteUserView(UserDomainRolePermissionView, SuccessMessageMixin):
class DomainDeleteUserView(UserDomainRolePermissionDeleteView, SuccessMessageMixin):
"""Inside of a domain's user management, a form for deleting users.
"""
object: UserDomainRole # workaround for type mismatch in DeleteView
def get_object(self, queryset=None):
"""Custom get_object definition to grab a UserDomainRole object from a domain_id and user_id"""
domain_id = self.kwargs.get('pk')
user_id = self.kwargs.get('user_pk')
return UserDomainRole.objects.get(domain=domain_id, user=user_id)
def get_success_url(self):
return reverse("domain-users", kwargs={"pk": self.object.domain.id})

10
src/registrar/views/utility/mixins.py
View file

@ -299,17 +299,13 @@ class UserDomainRolePermission(PermissionsLoginMixin):
"""
domain_pk = self.kwargs["pk"]
user_pk = self.kwargs["user_pk"]
print(f"here is the user: {self.request.user} and kwargs: {domain_pk}")
if not self.request.user.is_authenticated:
return False
print("User was authenticated!")
x = UserDomainRole.objects.filter(
id=user_pk
).get()
print(x)
# TODO - exclude the creator from this
if not UserDomainRole.objects.filter(
domain__id=domain_pk, domain__permissions__user=self.request.user
user=user_pk, domain=domain_pk
).exists():
return False