From 1dfe34d9c6a370cd3e66cb1e77f272109e67fe7a Mon Sep 17 00:00:00 2001 From: David Kennedy Date: Thu, 1 Aug 2024 18:09:54 -0400 Subject: [PATCH] fixed view icon --- src/registrar/views/domains_json.py | 10 +++------- src/registrar/views/utility/mixins.py | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/registrar/views/domains_json.py b/src/registrar/views/domains_json.py index d4c09d808..5bb9b037f 100644 --- a/src/registrar/views/domains_json.py +++ b/src/registrar/views/domains_json.py @@ -124,7 +124,7 @@ def serialize_domain(domain, user): # Check if there is a UserDomainRole for this domain and user user_domain_role_exists = UserDomainRole.objects.filter(domain_id=domain.id, user=user).exists() - + view_only = not user_domain_role_exists or domain.state in [Domain.State.DELETED, Domain.State.ON_HOLD] return { "id": domain.id, "name": domain.name, @@ -133,11 +133,7 @@ def serialize_domain(domain, user): "state_display": domain.state_display(), "get_state_help_text": domain.get_state_help_text(), "action_url": reverse("domain", kwargs={"pk": domain.id}), - "action_label": ( - "View" - if not user_domain_role_exists or domain.state in [Domain.State.DELETED, Domain.State.ON_HOLD] - else "Manage" - ), - "svg_icon": ("visibility" if domain.state in [Domain.State.DELETED, Domain.State.ON_HOLD] else "settings"), + "action_label": ("View" if view_only else "Manage"), + "svg_icon": ("visibility" if view_only else "settings"), "suborganization": suborganization_name, } diff --git a/src/registrar/views/utility/mixins.py b/src/registrar/views/utility/mixins.py index 5b8f81087..16a896100 100644 --- a/src/registrar/views/utility/mixins.py +++ b/src/registrar/views/utility/mixins.py @@ -191,7 +191,7 @@ class DomainPermission(PermissionsLoginMixin): def can_access_domain_via_portfolio(self, pk): """Most views should not allow permission to portfolio users. - If particular views allow permissions, they will need to override + If particular views allow access to the domain pages, they will need to override this function.""" return False