From c5856c539d1dce5d1692c349f7ccacff8f5de8e7 Mon Sep 17 00:00:00 2001 From: Montana Date: Thu, 25 Oct 2018 10:56:23 -0400 Subject: [PATCH] Use Vue for template rendering --- atst/routes/workspaces.py | 8 +++++++- templates/workspaces/members/index.html | 26 ++++++++++++------------- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/atst/routes/workspaces.py b/atst/routes/workspaces.py index 324153dd..8547f9bc 100644 --- a/atst/routes/workspaces.py +++ b/atst/routes/workspaces.py @@ -103,7 +103,13 @@ def workspace_members(workspace_id): filter(lambda m: m.user_name == new_member_name, workspace.members), None ) members_list = [ - {"name": k.user_name, "role": k.role, "num_env": k.num_environment_roles} + { + "name": k.user_name, + "status": k.status, + "id": k.user_id, + "role": k.role, + "num_env": k.num_environment_roles, + } for k in workspace.members ] diff --git a/templates/workspaces/members/index.html b/templates/workspaces/members/index.html index 329143cd..8bde5d24 100644 --- a/templates/workspaces/members/index.html +++ b/templates/workspaces/members/index.html @@ -80,7 +80,6 @@ -
@@ -91,20 +90,21 @@ + - {% for m in workspace.members %} - {% set num_environment_roles = m.num_environment_roles %} - - - {% if num_environment_roles %} - - {% else %} - - {% endif %} - - + + + + + + - {% endfor %}
Workspace Role
{{ m.user_name }}{{ num_environment_roles }}No Environment Access{{ m.status }}{{ m.role_displayname }}
+ + + + + No Environment Access +