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 --- api4/team_test.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'api4') diff --git a/api4/team_test.go b/api4/team_test.go index 665db95f5..b517f67fe 100644 --- a/api4/team_test.go +++ b/api4/team_test.go @@ -1422,7 +1422,8 @@ func TestInviteUsersToTeam(t *testing.T) { t.Fatal("should return true") } - expectedSubject := "[Mattermost] " + th.SystemAdminUser.GetDisplayName() + " invited you to join " + th.BasicTeam.DisplayName + " Team" + nameFormat := *utils.Cfg.TeamSettings.TeammateNameDisplay + expectedSubject := "[Mattermost] " + th.SystemAdminUser.GetDisplayName(nameFormat) + " invited you to join " + th.BasicTeam.DisplayName + " Team" //Check if the email was send to the rigth email address for _, email := range emailList { var resultsMailbox utils.JSONMessageHeaderInbucket -- cgit v1.2.3-1-g7c22