diff options
author | Christopher Speller <crspeller@gmail.com> | 2015-10-28 08:34:57 -0400 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2015-10-28 08:34:57 -0400 |
commit | c6f3361d3caf671ca64b798d5ac9eca97c387f9e (patch) | |
tree | 1fb5df9955402edcb6f01f26ef9a0b11491c7aef /web | |
parent | 53221120454e1111f0f73f90ec5b9ecf5b4d2303 (diff) | |
parent | 36308f949d434675eca31b8eb1cd04c863273c93 (diff) | |
download | chat-c6f3361d3caf671ca64b798d5ac9eca97c387f9e.tar.gz chat-c6f3361d3caf671ca64b798d5ac9eca97c387f9e.tar.bz2 chat-c6f3361d3caf671ca64b798d5ac9eca97c387f9e.zip |
Merge pull request #1210 from mattermost/PLT-25
PLT-25 fixing issues with stats page
Diffstat (limited to 'web')
-rw-r--r-- | web/react/components/admin_console/team_analytics.jsx | 4 | ||||
-rw-r--r-- | web/react/components/admin_console/team_users.jsx | 10 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_admin-console.scss | 1 |
3 files changed, 4 insertions, 11 deletions
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; |