From eea64f8049d90c5dcf14a739d640f5aa6a9c7add Mon Sep 17 00:00:00 2001 From: Saturnino Abril Date: Fri, 30 Jun 2017 16:06:59 +0800 Subject: [PLT-5864] Move teammate name display setting to the System Console (#6681) * move teammate name display setting to the system console * update all the likes of TeammateNameDisplay names * fix gofmt error * rebase and fix conflict --- app/team.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'app/team.go') diff --git a/app/team.go b/app/team.go index be15b8a39..8f2f7cfcb 100644 --- a/app/team.go +++ b/app/team.go @@ -657,7 +657,8 @@ func InviteNewUsersToTeam(emailList []string, teamId, senderId string) *model.Ap user = result.Data.(*model.User) } - SendInviteEmails(team, user.GetDisplayName(), emailList, utils.GetSiteURL()) + nameFormat := *utils.Cfg.TeamSettings.TeammateNameDisplay + SendInviteEmails(team, user.GetDisplayName(nameFormat), emailList, utils.GetSiteURL()) return nil } -- cgit v1.2.3-1-g7c22