diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2015-10-16 07:57:38 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2015-10-16 07:57:38 -0400 |
| commit | 7718783d0c57d46db00123379d3b8f9818bb791b (patch) | |
| tree | e8e2ec79550727f80c5ba21ae82bd8d36587e362 /model | |
| parent | 92e986945cccf4f586c59e6c418cb240f6864a4b (diff) | |
| parent | 7abde676a1828714c71b25184fdd91a81c2d77a1 (diff) | |
| download | chat-7718783d0c57d46db00123379d3b8f9818bb791b.tar.gz chat-7718783d0c57d46db00123379d3b8f9818bb791b.tar.bz2 chat-7718783d0c57d46db00123379d3b8f9818bb791b.zip | |
Merge pull request #1049 from apaatsio/full-teams-data
Use display name instead of name in team switcher menu
Diffstat (limited to 'model')
| -rw-r--r-- | model/client.go | 2 | ||||
| -rw-r--r-- | model/team.go | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/model/client.go b/model/client.go index 77b0aaad2..19c99df72 100644 --- a/model/client.go +++ b/model/client.go @@ -185,7 +185,7 @@ func (c *Client) FindTeams(email string) (*Result, *AppError) { } else { return &Result{r.Header.Get(HEADER_REQUEST_ID), - r.Header.Get(HEADER_ETAG_SERVER), ArrayFromJson(r.Body)}, nil + r.Header.Get(HEADER_ETAG_SERVER), TeamMapFromJson(r.Body)}, nil } } diff --git a/model/team.go b/model/team.go index c0f6524cd..584c78f8d 100644 --- a/model/team.go +++ b/model/team.go @@ -219,3 +219,9 @@ func CleanTeamName(s string) string { func (o *Team) PreExport() { } + +func (o *Team) Sanitize() { + o.Email = "" + o.Type = "" + o.AllowedDomains = "" +} |