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

Pass users' roles to the template

Browse Source
This commit is contained in:
Montana 2019-04-10 10:42:16 -04:00
parent d722f8f375
commit d9c3cf340f
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
atst/routes/portfolios/applications.py
View File

@ -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

13
tests/routes/portfolios/test_applications.py
View File

@ -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}],
} }