Fix for #116. Only LDAPUsers were being counted as team members. Added the sum of both LDAP and Managed users to the total count.

(cherry picked from commit 9bc916a)

Author: stevespringett

src/main/webapp/admin/functions.js

@@ -37,10 +37,14 @@ function formatTeamTable(res) {
         } else {
             res[i].apiKeysNum = res[i].apiKeys.length;
         }
-        if (res[i].ldapUsers === undefined) {
-            res[i].membersNum = 0;
-        } else {
-            res[i].membersNum = res[i].ldapUsers.length;
+
+        res[i].membersNum = 0;
+
+        if (res[i].ldapUsers !== undefined) {
+            res[i].membersNum += res[i].ldapUsers.length;
+        }
+        if (res[i].managedUsers !== undefined) {
+            res[i].membersNum += res[i].managedUsers.length;
         }
     }
     return res;