Merge pull request #753 from dod-ccpo/show-members-roles
Show Members' Roles on Application Environments Table
This commit is contained in:
commit
9c14731b79
@ -56,7 +56,12 @@ def get_environments_obj_for_app(application):
|
|||||||
environments_obj = {}
|
environments_obj = {}
|
||||||
|
|
||||||
for env in application.environments:
|
for env in application.environments:
|
||||||
environments_obj[env.name] = [user.full_name for user in env.users]
|
environments_obj[env.name] = []
|
||||||
|
for user in env.users:
|
||||||
|
env_role = EnvironmentRoles.get(user.id, env.id)
|
||||||
|
environments_obj[env.name].append(
|
||||||
|
{"name": user.full_name, "role": env_role.displayname}
|
||||||
|
)
|
||||||
|
|
||||||
return environments_obj
|
return environments_obj
|
||||||
|
|
||||||
|
@ -105,8 +105,15 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
border-bottom: 1px dashed $color-white;
|
border-bottom: 1px dashed $color-white;
|
||||||
background-color: $color-gray-lightest;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.accordion-table__item__expanded_first {
|
||||||
|
float: left;
|
||||||
|
font-weight: bold;
|
||||||
|
}
|
||||||
|
|
||||||
|
background-color: $color-gray-lightest;
|
||||||
|
padding: $gap $gap * 5 $gap * 4 $gap * 5;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -18,6 +18,10 @@
|
|||||||
@include hide;
|
@include hide;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.right {
|
||||||
|
float: right;
|
||||||
|
}
|
||||||
|
|
||||||
@mixin unhide {
|
@mixin unhide {
|
||||||
clip: auto;
|
clip: auto;
|
||||||
clip-path: none;
|
clip-path: none;
|
||||||
|
@ -26,7 +26,8 @@
|
|||||||
<ul>
|
<ul>
|
||||||
{% for member in members_list %}
|
{% for member in members_list %}
|
||||||
<li class="accordion-table__item__expanded">
|
<li class="accordion-table__item__expanded">
|
||||||
<div class="accordion-table__item-content">{{ member }}</div>
|
<div class="accordion-table__item__expanded_first">{{ member.name }}</div>
|
||||||
|
<div class="right">{{ member.role }}</div>
|
||||||
</li>
|
</li>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</ul>
|
</ul>
|
||||||
|
@ -119,9 +119,9 @@ def test_edit_application_environments_obj(app, client, user_session):
|
|||||||
user2 = UserFactory.create()
|
user2 = UserFactory.create()
|
||||||
env1 = application.environments[0]
|
env1 = application.environments[0]
|
||||||
env2 = application.environments[1]
|
env2 = application.environments[1]
|
||||||
EnvironmentRoleFactory.create(environment=env1, user=user1)
|
env_role1 = EnvironmentRoleFactory.create(environment=env1, user=user1)
|
||||||
EnvironmentRoleFactory.create(environment=env1, user=user2)
|
env_role2 = EnvironmentRoleFactory.create(environment=env1, user=user2)
|
||||||
EnvironmentRoleFactory.create(environment=env2, user=user1)
|
env_role3 = EnvironmentRoleFactory.create(environment=env2, user=user1)
|
||||||
|
|
||||||
user_session(portfolio.owner)
|
user_session(portfolio.owner)
|
||||||
|
|
||||||
@ -137,8 +137,11 @@ def test_edit_application_environments_obj(app, client, user_session):
|
|||||||
assert response.status_code == 200
|
assert response.status_code == 200
|
||||||
_, context = templates[0]
|
_, context = templates[0]
|
||||||
assert context["environments_obj"] == {
|
assert context["environments_obj"] == {
|
||||||
env1.name: [user1.full_name, user2.full_name],
|
env1.name: [
|
||||||
env2.name: [user1.full_name],
|
{"name": user1.full_name, "role": env_role1.role},
|
||||||
|
{"name": user2.full_name, "role": env_role2.role},
|
||||||
|
],
|
||||||
|
env2.name: [{"name": user1.full_name, "role": env_role3.role}],
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user