diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2016-11-08 09:59:40 -0500 |
|---|---|---|
| committer | Harrison Healey <harrisonmhealey@gmail.com> | 2016-11-08 09:59:40 -0500 |
| commit | 707b01e1ab8e32cd9006f6ded2c00665b9fb69c5 (patch) | |
| tree | 4101cbb1374ba7f236d9d71a29492dec1e5192d6 | |
| parent | 376f7c6f0e06baeffc8642de1685abf2ced70aa3 (diff) | |
| download | chat-707b01e1ab8e32cd9006f6ded2c00665b9fb69c5.tar.gz chat-707b01e1ab8e32cd9006f6ded2c00665b9fb69c5.tar.bz2 chat-707b01e1ab8e32cd9006f6ded2c00665b9fb69c5.zip | |
Don't count inactive users on statistic pages (#4482)
| -rw-r--r-- | store/sql_user_store.go | 7 | ||||
| -rw-r--r-- | webapp/components/admin_console/admin_team_members_dropdown.jsx | 1 |
2 files changed, 5 insertions, 3 deletions
diff --git a/store/sql_user_store.go b/store/sql_user_store.go index 836a502fc..984b544d7 100644 --- a/store/sql_user_store.go +++ b/store/sql_user_store.go @@ -1029,10 +1029,11 @@ func (us SqlUserStore) AnalyticsUniqueUserCount(teamId string) StoreChannel { go func() { result := StoreResult{} - query := "SELECT COUNT(DISTINCT Email) FROM Users" - + query := "" if len(teamId) > 0 { - query += ", TeamMembers WHERE TeamMembers.TeamId = :TeamId AND Users.Id = TeamMembers.UserId" + query = "SELECT COUNT(DISTINCT Users.Email) From Users, TeamMembers WHERE TeamMembers.TeamId = :TeamId AND Users.Id = TeamMembers.UserId AND TeamMembers.DeleteAt = 0 AND Users.DeleteAt = 0" + } else { + query = "SELECT COUNT(DISTINCT Email) FROM Users WHERE DeleteAt = 0" } v, err := us.GetReplica().SelectInt(query, map[string]interface{}{"TeamId": teamId}) diff --git a/webapp/components/admin_console/admin_team_members_dropdown.jsx b/webapp/components/admin_console/admin_team_members_dropdown.jsx index dffc0573a..0331e6c4e 100644 --- a/webapp/components/admin_console/admin_team_members_dropdown.jsx +++ b/webapp/components/admin_console/admin_team_members_dropdown.jsx @@ -81,6 +81,7 @@ export default class AdminTeamMembersDropdown extends React.Component { this.props.teamMember.team_id, this.props.user.id, () => { + AsyncClient.getTeamStats(this.props.teamMember.team_id); UserStore.removeProfileFromTeam(this.props.teamMember.team_id, this.props.user.id); UserStore.emitInTeamChange(); }, |