Properly set deleted data for UpdateMemberForm and display suspended env access text

Styling for env name and role in update app member perms form
This commit is contained in:
leigh-mil
2019-10-25 11:44:15 -04:00
parent d40c11a8f6
commit f928b776a6
6 changed files with 80 additions and 71 deletions

View File

@@ -126,3 +126,11 @@ class EnvironmentRoles(object):
.one_or_none()
)
return existing_env_role
@classmethod
def get_all_for_application_member(cls, application_role_id):
return (
db.session.query(EnvironmentRole)
.filter(EnvironmentRole.application_role_id == application_role_id)
.all()
)

View File

@@ -77,12 +77,16 @@ def filter_env_roles_form_data(member, environments):
"environment_id": str(env.id),
"environment_name": env.name,
"role": NO_ACCESS,
"deleted": env.deleted,
"deleted": False,
}
env_roles_set = set(env.roles).intersection(set(member.environment_roles))
env_roles_set = set(env.roles).intersection(
set(EnvironmentRoles.get_all_for_application_member(member.id))
)
if len(env_roles_set) == 1:
(env_role,) = env_roles_set
env_data["role"] = env_role.role
env_data["deleted"] = env_role.deleted
env_roles_form_data.append(env_data)