From 11b3120bfd8cb643717a764cab9234bfdc0d8383 Mon Sep 17 00:00:00 2001 From: leigh-mil Date: Tue, 14 Jan 2020 14:47:41 -0500 Subject: [PATCH] Update filter functions to display properly when users env access has been revoked --- atst/routes/applications/settings.py | 5 +++-- templates/applications/fragments/members.html | 2 +- tests/routes/applications/test_settings.py | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/atst/routes/applications/settings.py b/atst/routes/applications/settings.py index 60010d02..91676cfb 100644 --- a/atst/routes/applications/settings.py +++ b/atst/routes/applications/settings.py @@ -78,7 +78,7 @@ def filter_env_roles_data(roles): { "environment_id": str(role.environment.id), "environment_name": role.environment.name, - "role": role.role, + "role": (role.role.value if role.role else "None"), } for role in roles ], @@ -99,8 +99,9 @@ def filter_env_roles_form_data(member, environments): if len(env_roles_set) == 1: (env_role,) = env_roles_set - env_data["role"] = env_role.role.name env_data["disabled"] = env_role.disabled + if env_role.role: + env_data["role"] = env_role.role.name env_roles_form_data.append(env_data) diff --git a/templates/applications/fragments/members.html b/templates/applications/fragments/members.html index 6f240272..d6fb7290 100644 --- a/templates/applications/fragments/members.html +++ b/templates/applications/fragments/members.html @@ -126,7 +126,7 @@ {{ env.environment_name }} - : {{ env.role.value }} + : {{ env.role }} {% endfor %} diff --git a/tests/routes/applications/test_settings.py b/tests/routes/applications/test_settings.py index b1b1980c..523a1346 100644 --- a/tests/routes/applications/test_settings.py +++ b/tests/routes/applications/test_settings.py @@ -212,7 +212,7 @@ def test_get_members_data(app, client, user_session): { "environment_id": str(environment.id), "environment_name": environment.name, - "role": env_role.role, + "role": env_role.role.value, } ] assert member["role_status"]