From 36308f949d434675eca31b8eb1cd04c863273c93 Mon Sep 17 00:00:00 2001
From: =Corey Hulen <corey@hulen.com>
Date: Tue, 27 Oct 2015 22:55:10 -0700
Subject: PLT-25 fixing issues with stats page

---
 api/user.go                                           |  6 ++++++
 web/react/components/admin_console/team_analytics.jsx |  4 ++++
 web/react/components/admin_console/team_users.jsx     | 10 ----------
 web/sass-files/sass/partials/_admin-console.scss      |  1 -
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/api/user.go b/api/user.go
index 3796a50ee..c9958767f 100644
--- a/api/user.go
+++ b/api/user.go
@@ -652,6 +652,12 @@ func getProfiles(c *Context, w http.ResponseWriter, r *http.Request) {
 		for k, p := range profiles {
 			options := utils.SanitizeOptions
 			options["passwordupdate"] = false
+
+			if c.HasSystemAdminPermissions("getProfiles") {
+				options["fullname"] = true
+				options["email"] = true
+			}
+
 			p.Sanitize(options)
 			profiles[k] = p
 		}
diff --git a/web/react/components/admin_console/team_analytics.jsx b/web/react/components/admin_console/team_analytics.jsx
index dd8812ad0..a945a551c 100644
--- a/web/react/components/admin_console/team_analytics.jsx
+++ b/web/react/components/admin_console/team_analytics.jsx
@@ -56,6 +56,8 @@ export default class TeamAnalytics extends React.Component {
             teamId,
             'post_counts_day',
             (data) => {
+                data.reverse();
+
                 var chartData = {
                     labels: [],
                     datasets: [{
@@ -89,6 +91,8 @@ export default class TeamAnalytics extends React.Component {
             teamId,
             'user_counts_with_posts_day',
             (data) => {
+                data.reverse();
+
                 var chartData = {
                     labels: [],
                     datasets: [{
diff --git a/web/react/components/admin_console/team_users.jsx b/web/react/components/admin_console/team_users.jsx
index ffb412159..b44aba56e 100644
--- a/web/react/components/admin_console/team_users.jsx
+++ b/web/react/components/admin_console/team_users.jsx
@@ -33,14 +33,6 @@ export default class UserList extends React.Component {
         this.getTeamProfiles(this.props.team.id);
     }
 
-    // this.setState({
-    //     teamId: this.state.teamId,
-    //     users: this.state.users,
-    //     serverError: this.state.serverError,
-    //     showPasswordModal: this.state.showPasswordModal,
-    //     user: this.state.user
-    // });
-
     getTeamProfiles(teamId) {
         Client.getProfilesForTeam(
             teamId,
@@ -95,8 +87,6 @@ export default class UserList extends React.Component {
     }
 
     doPasswordResetDismiss() {
-        this.state.showPasswordModal = false;
-        this.state.user = null;
         this.setState({
             teamId: this.state.teamId,
             users: this.state.users,
diff --git a/web/sass-files/sass/partials/_admin-console.scss b/web/sass-files/sass/partials/_admin-console.scss
index d0241f795..9c65e2d1e 100644
--- a/web/sass-files/sass/partials/_admin-console.scss
+++ b/web/sass-files/sass/partials/_admin-console.scss
@@ -38,7 +38,6 @@
 
     .recent-active-users {
         width: 365px;
-        height: 375px;
         border: 1px solid #ddd;
         padding: 5px 10px 10px 10px;
         margin: 10px 10px 10px 10px;
-- 
cgit v1.2.3-1-g7c22