diff options
| author | cpanato <ctadeu@gmail.com> | 2018-07-10 19:27:14 +0200 |
|---|---|---|
| committer | cpanato <ctadeu@gmail.com> | 2018-07-10 19:27:14 +0200 |
| commit | c042ffa460296587579aff54b157a5109e022f7e (patch) | |
| tree | 9e7f77fbc83b6d06204db099066be8999dbb22d9 /app/team.go | |
| parent | 9470564d355c201155f6fcb123152b8ac954f812 (diff) | |
| parent | dccd95bc67779a5b83a2660aec0cf4622cd56550 (diff) | |
| download | chat-c042ffa460296587579aff54b157a5109e022f7e.tar.gz chat-c042ffa460296587579aff54b157a5109e022f7e.tar.bz2 chat-c042ffa460296587579aff54b157a5109e022f7e.zip | |
Merge remote-tracking branch 'upstream/release-5.1' into release-5.1-daily-merge-20180710
Diffstat (limited to 'app/team.go')
| -rw-r--r-- | app/team.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/team.go b/app/team.go index beb4b1449..d9f19fab8 100644 --- a/app/team.go +++ b/app/team.go @@ -805,6 +805,10 @@ func (a *App) postRemoveFromTeamMessage(user *model.User, channel *model.Channel } func (a *App) InviteNewUsersToTeam(emailList []string, teamId, senderId string) *model.AppError { + if !*a.Config().ServiceSettings.EnableEmailInvitations { + return model.NewAppError("InviteNewUsersToTeam", "api.team.invite_members.disabled.app_error", nil, "", http.StatusNotImplemented) + } + if len(emailList) == 0 { err := model.NewAppError("InviteNewUsersToTeam", "api.team.invite_members.no_one.app_error", nil, "", http.StatusBadRequest) return err @@ -842,7 +846,7 @@ func (a *App) InviteNewUsersToTeam(emailList []string, teamId, senderId string) } nameFormat := *a.Config().TeamSettings.TeammateNameDisplay - a.SendInviteEmails(team, user.GetDisplayName(nameFormat), emailList, a.GetSiteURL()) + a.SendInviteEmails(team, user.GetDisplayName(nameFormat), user.Id, emailList, a.GetSiteURL()) return nil } |