From c09f1b9e4e5638080622ff9aa70735db382a16df Mon Sep 17 00:00:00 2001 From: hmhealey Date: Thu, 9 Jul 2015 13:59:19 -0400 Subject: Renamed FullName column in database to Nickname. Renamed all serverside references from FullName to Nickname. --- api/team.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'api/team.go') diff --git a/api/team.go b/api/team.go index f9aeecd7e..dc7804b4d 100644 --- a/api/team.go +++ b/api/team.go @@ -488,10 +488,10 @@ func InviteMembers(team *model.Team, user *model.User, invites []string) { } sender := "" - if len(strings.TrimSpace(user.FullName)) == 0 { + if len(strings.TrimSpace(user.Nickname)) == 0 { sender = user.Username } else { - sender = user.FullName + sender = user.Nickname } senderRole := "" -- cgit v1.2.3-1-g7c22 From 098cbcdc21effeebe7e57fbd912a785e85cbfc5d Mon Sep 17 00:00:00 2001 From: hmhealey Date: Mon, 13 Jul 2015 17:47:57 -0400 Subject: Unify all locations where we determine a user's display named based off of their nickname/username into a helper function --- api/team.go | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'api/team.go') diff --git a/api/team.go b/api/team.go index dc7804b4d..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.Nickname)) == 0 { - sender = user.Username - } else { - sender = user.Nickname - } + sender := user.GetDisplayName() senderRole := "" if strings.Contains(user.Roles, model.ROLE_ADMIN) || strings.Contains(user.Roles, model.ROLE_SYSTEM_ADMIN) { -- cgit v1.2.3-1-g7c22