pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update filter functions to display properly when users env access has been revoked

Browse Source
This commit is contained in:
leigh-mil
2020-01-14 14:47:41 -05:00
parent 17864cc060
commit 11b3120bfd
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
atst/routes/applications/settings.py
View File

@@ -78,7 +78,7 @@ def filter_env_roles_data(roles):
{ {
"environment_id": str(role.environment.id), "environment_id": str(role.environment.id),
"environment_name": role.environment.name, "environment_name": role.environment.name,
"role": role.role, "role": (role.role.value if role.role else "None"),
} }
for role in roles for role in roles
], ],
@@ -99,8 +99,9 @@ def filter_env_roles_form_data(member, environments):
if len(env_roles_set) == 1: if len(env_roles_set) == 1:
(env_role,) = env_roles_set (env_role,) = env_roles_set
env_data["role"] = env_role.role.name
env_data["disabled"] = env_role.disabled env_data["disabled"] = env_role.disabled
if env_role.role:
env_data["role"] = env_role.role.name
env_roles_form_data.append(env_data) env_roles_form_data.append(env_data)

2
templates/applications/fragments/members.html
View File

@@ -126,7 +126,7 @@
{{ env.environment_name }} {{ env.environment_name }}
</span> </span>
<span class="env-role__role"> <span class="env-role__role">
: {{ env.role.value }} : {{ env.role }}
</span> </span>
</div> </div>
{% endfor %} {% endfor %}

2
tests/routes/applications/test_settings.py
View File

@@ -212,7 +212,7 @@ def test_get_members_data(app, client, user_session):
{ {
"environment_id": str(environment.id), "environment_id": str(environment.id),
"environment_name": environment.name, "environment_name": environment.name,
"role": env_role.role, "role": env_role.role.value,
} }
] ]
assert member["role_status"] assert member["role_status"]