PLT-25 fixing issues with stats page
Этот коммит содержится в:
@@ -652,6 +652,12 @@ func getProfiles(c *Context, w http.ResponseWriter, r *http.Request) {
|
|||||||
for k, p := range profiles {
|
for k, p := range profiles {
|
||||||
options := utils.SanitizeOptions
|
options := utils.SanitizeOptions
|
||||||
options["passwordupdate"] = false
|
options["passwordupdate"] = false
|
||||||
|
|
||||||
|
if c.HasSystemAdminPermissions("getProfiles") {
|
||||||
|
options["fullname"] = true
|
||||||
|
options["email"] = true
|
||||||
|
}
|
||||||
|
|
||||||
p.Sanitize(options)
|
p.Sanitize(options)
|
||||||
profiles[k] = p
|
profiles[k] = p
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -56,6 +56,8 @@ export default class TeamAnalytics extends React.Component {
|
|||||||
teamId,
|
teamId,
|
||||||
'post_counts_day',
|
'post_counts_day',
|
||||||
(data) => {
|
(data) => {
|
||||||
|
data.reverse();
|
||||||
|
|
||||||
var chartData = {
|
var chartData = {
|
||||||
labels: [],
|
labels: [],
|
||||||
datasets: [{
|
datasets: [{
|
||||||
@@ -89,6 +91,8 @@ export default class TeamAnalytics extends React.Component {
|
|||||||
teamId,
|
teamId,
|
||||||
'user_counts_with_posts_day',
|
'user_counts_with_posts_day',
|
||||||
(data) => {
|
(data) => {
|
||||||
|
data.reverse();
|
||||||
|
|
||||||
var chartData = {
|
var chartData = {
|
||||||
labels: [],
|
labels: [],
|
||||||
datasets: [{
|
datasets: [{
|
||||||
|
|||||||
@@ -33,14 +33,6 @@ export default class UserList extends React.Component {
|
|||||||
this.getTeamProfiles(this.props.team.id);
|
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) {
|
getTeamProfiles(teamId) {
|
||||||
Client.getProfilesForTeam(
|
Client.getProfilesForTeam(
|
||||||
teamId,
|
teamId,
|
||||||
@@ -95,8 +87,6 @@ export default class UserList extends React.Component {
|
|||||||
}
|
}
|
||||||
|
|
||||||
doPasswordResetDismiss() {
|
doPasswordResetDismiss() {
|
||||||
this.state.showPasswordModal = false;
|
|
||||||
this.state.user = null;
|
|
||||||
this.setState({
|
this.setState({
|
||||||
teamId: this.state.teamId,
|
teamId: this.state.teamId,
|
||||||
users: this.state.users,
|
users: this.state.users,
|
||||||
|
|||||||
@@ -38,7 +38,6 @@
|
|||||||
|
|
||||||
.recent-active-users {
|
.recent-active-users {
|
||||||
width: 365px;
|
width: 365px;
|
||||||
height: 375px;
|
|
||||||
border: 1px solid #ddd;
|
border: 1px solid #ddd;
|
||||||
padding: 5px 10px 10px 10px;
|
padding: 5px 10px 10px 10px;
|
||||||
margin: 10px 10px 10px 10px;
|
margin: 10px 10px 10px 10px;
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user