From ac1c4cd5b74c6f224e1b82a9147cb7eaf2e2c92d Mon Sep 17 00:00:00 2001
From: richard-dds <richard-ctr@friends.dds.mil>
Date: Mon, 24 Sep 2018 14:45:03 -0400
Subject: [PATCH] Display members' count of environment roles

---
 atst/models/workspace_user.py           | 9 ++++++---
 templates/workspaces/members/index.html | 9 +++++++--
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/atst/models/workspace_user.py b/atst/models/workspace_user.py
index 934c6f89..7af31470 100644
--- a/atst/models/workspace_user.py
+++ b/atst/models/workspace_user.py
@@ -41,8 +41,8 @@ class WorkspaceUser(object):
         return "active"
 
     @property
-    def has_environment_roles(self):
-        num_environment_roles = (
+    def num_environment_roles(self):
+        return (
             db.session.query(EnvironmentRole)
             .join(EnvironmentRole.environment)
             .join(Environment.project)
@@ -51,4 +51,7 @@ class WorkspaceUser(object):
             .filter(EnvironmentRole.user_id == self.user_id)
             .count()
         )
-        return num_environment_roles > 0
+
+    @property
+    def has_environment_roles(self):
+        return self.num_environment_roles > 0
diff --git a/templates/workspaces/members/index.html b/templates/workspaces/members/index.html
index 02b721a1..5fb8e9eb 100644
--- a/templates/workspaces/members/index.html
+++ b/templates/workspaces/members/index.html
@@ -82,16 +82,21 @@
       <thead>
         <tr>
           <th scope="col" width="50%">Name</th>
-          <th scope="col" class='table-cell--shrink'>&nbsp;<span class="hide">Status Flag</span></th>
+          <th scope="col">Environments</th>
           <th scope="col">Status</th>
           <th scope="col">Workspace Role</th>
         </tr>
       </thead>
       <tbody>
         {% for m in workspace.members %}
+        {% set num_environment_roles = m.num_environment_roles %}
         <tr>
           <td><a href="{{ url_for('workspaces.update_member', workspace_id=workspace.id, member_id=m.user_id) }}" class="icon-link icon-link--large">{{ m.user_name }}</a></td>
-          <td class='table-cell--shrink'>{% if not m.has_environment_roles %} <span class="label label--info">No Environment Access</span> {% endif %}</td>
+          {% if num_environment_roles %}
+            <td class="table-cell--align-right">{{ num_environment_roles }}</td>
+          {% else %}
+            <td class='table-cell--shrink'><span class="label label--info">No Environment Access</span></td>
+          {% endif %}
           <td>{{ m.status }}</a></td>
           <td>{{ m.role }}</a></td>
         </tr>