mirror of
https://github.com/mattermost/mattermost.git
synced 2025-02-25 18:55:24 -06:00
PLT-25 fixing issues with stats page
This commit is contained in:
@@ -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
|
||||
}
|
||||
|
||||
@@ -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: [{
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user