From a9e46c64b1d84e3a4e7eefbeb89f21f6fe83b2e5 Mon Sep 17 00:00:00 2001
From: Girish Ramakrishnan <girish@cloudron.io>
Date: Thu, 26 Jul 2018 23:58:25 -0700
Subject: [PATCH] Show group members

---
 src/views/users.html | 5 ++++-
 src/views/users.js   | 4 ++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/views/users.html b/src/views/users.html
index 464971302..26e24f02a 100644
--- a/src/views/users.html
+++ b/src/views/users.html
@@ -323,7 +323,6 @@
                                   </span>
                               </td>
 
-                              </td>
                               <td class="text-right no-wrap" style="vertical-align: bottom">
                                   <button ng-show="!isMe(user)" class="btn btn-xs btn-default" ng-click="sendInvite(user)" title="Send invitation email"><i class="fa fa-paper-plane-o"></i></button>
                                   <button class="btn btn-xs btn-default" ng-click="useredit.show(user)" title="Edit User"><i class="fa fa-pencil"></i></button>
@@ -359,6 +358,7 @@
                       <thead>
                           <tr>
                               <th>Name</th>
+                              <th>Users</th>
                               <th style="width: 300px" class="text-right">Actions</th>
                           </tr>
                       </thead>
@@ -367,6 +367,9 @@
                               <td class="hand elide-table-cell" style="text-overflow: ellipsis; white-space: nowrap;" ng-click="groupEdit.show(group)">
                                   {{ group.name }}
                               </td>
+                              <td class="hand elide-table-cell" style="text-overflow: ellipsis; white-space: nowrap;" ng-click="groupEdit.show(group)">
+                                {{ groupMembers(group) }}
+                            </td>
                               <td class="text-right" style="vertical-align: bottom">
                                     <button class="btn btn-xs btn-default" ng-click="groupEdit.show(group)" title="Edit Group"><i class="fa fa-pencil"></i></button>
                                   <button class="btn btn-xs btn-danger" ng-click="groupRemove.show(group)" title="Remove Group"><i class="fa fa-trash-o"></i></button>
diff --git a/src/views/users.js b/src/views/users.js
index ad068efd9..6d980b1db 100644
--- a/src/views/users.js
+++ b/src/views/users.js
@@ -14,6 +14,10 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
     $scope.config = Client.getConfig();
     $scope.userInfo = Client.getUserInfo();
 
+    $scope.groupMembers = function (group) {
+        return group.userIds.map(function (uid) { return $scope.usersById[uid].username || $scope.usersById[uid].email; }).join(', ');
+    };
+
     $scope.userremove = {
         busy: false,
         error: {},