diff options
author | Corey Hulen <corey@hulen.com> | 2016-01-22 17:00:09 -0600 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2016-01-22 17:00:09 -0600 |
commit | 1a0b12313bd0af1724df2fc6260ef284acfc5f93 (patch) | |
tree | af8cd83e5beba2426251532e42ba059c59af59b9 /model | |
parent | d352c5b64dddfb8e46b18edbd7352c41495078a1 (diff) | |
parent | 60a73ebabba6798d2b45fa8c8ac0f2bfa6144689 (diff) | |
download | chat-1a0b12313bd0af1724df2fc6260ef284acfc5f93.tar.gz chat-1a0b12313bd0af1724df2fc6260ef284acfc5f93.tar.bz2 chat-1a0b12313bd0af1724df2fc6260ef284acfc5f93.zip |
Merge pull request #1956 from mattermost/plt-1779
PLT-1779 Add system-wide statistics page
Diffstat (limited to 'model')
-rw-r--r-- | model/client.go | 11 | ||||
-rw-r--r-- | model/user.go | 1 |
2 files changed, 10 insertions, 2 deletions
diff --git a/model/client.go b/model/client.go index 75b93c971..b8e7c4894 100644 --- a/model/client.go +++ b/model/client.go @@ -434,7 +434,7 @@ func (c *Client) TestEmail(config *Config) (*Result, *AppError) { } } -func (c *Client) GetAnalytics(teamId, name string) (*Result, *AppError) { +func (c *Client) GetTeamAnalytics(teamId, name string) (*Result, *AppError) { if r, err := c.DoApiGet("/admin/analytics/"+teamId+"/"+name, "", ""); err != nil { return nil, err } else { @@ -443,6 +443,15 @@ func (c *Client) GetAnalytics(teamId, name string) (*Result, *AppError) { } } +func (c *Client) GetSystemAnalytics(name string) (*Result, *AppError) { + if r, err := c.DoApiGet("/admin/analytics/"+name, "", ""); err != nil { + return nil, err + } else { + return &Result{r.Header.Get(HEADER_REQUEST_ID), + r.Header.Get(HEADER_ETAG_SERVER), AnalyticsRowsFromJson(r.Body)}, nil + } +} + func (c *Client) CreateChannel(channel *Channel) (*Result, *AppError) { if r, err := c.DoApiPost("/channels/create", channel.ToJson()); err != nil { return nil, err diff --git a/model/user.go b/model/user.go index 7744b0073..44228d93f 100644 --- a/model/user.go +++ b/model/user.go @@ -236,7 +236,6 @@ func (u *User) Sanitize(options map[string]bool) { } func (u *User) ClearNonProfileFields() { - u.CreateAt = 0 u.UpdateAt = 0 u.Password = "" u.AuthData = "" |