diff options
| author | Corey Hulen <corey@hulen.com> | 2015-07-17 14:01:01 -0800 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2015-07-17 14:01:01 -0800 |
| commit | b306ec84378b36372b5465c09233094314789bf2 (patch) | |
| tree | 1995d12ac34a4c6ba459884c84cb28b62d62b296 /api/team.go | |
| parent | 66c22d342fa42068382c9e80427ea953676357db (diff) | |
| parent | 1dba330146a10718a2fc9eac0ae7d6e1d6bc0d79 (diff) | |
| download | chat-b306ec84378b36372b5465c09233094314789bf2.tar.gz chat-b306ec84378b36372b5465c09233094314789bf2.tar.bz2 chat-b306ec84378b36372b5465c09233094314789bf2.zip | |
Merge pull request #177 from hmhealey/mm825
MM-825 Replace FullName field with separate FirstName and LastName fields and repurpose the existing FullName as Nickname
Diffstat (limited to 'api/team.go')
| -rw-r--r-- | api/team.go | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/api/team.go b/api/team.go index f9aeecd7e..7a4cabf7e 100644 --- a/api/team.go +++ b/api/team.go @@ -487,12 +487,7 @@ func InviteMembers(team *model.Team, user *model.User, invites []string) { teamUrl = fmt.Sprintf("http://%v.%v", team.Domain, utils.Cfg.ServiceSettings.Domain) } - sender := "" - if len(strings.TrimSpace(user.FullName)) == 0 { - sender = user.Username - } else { - sender = user.FullName - } + sender := user.GetDisplayName() senderRole := "" if strings.Contains(user.Roles, model.ROLE_ADMIN) || strings.Contains(user.Roles, model.ROLE_SYSTEM_ADMIN) { |