IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

[PLT-5864] Move teammate name display setting to the System Console (#6681)

Browse Source 
* move teammate name display setting to the system console

* update all the likes of TeammateNameDisplay names

* fix gofmt error

* rebase and fix conflict
This commit is contained in:
Saturnino Abril
2017-06-30 16:06:59 +08:00
committed by George Goldberg
parent fb57b3dd53
commit eea64f8049
17 changed files with 102 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api4/team_test.go
View File

@@ -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