diff options
author | Joram Wilander <jwawilander@gmail.com> | 2015-07-30 11:31:51 -0400 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2015-07-30 11:31:51 -0400 |
commit | 9105b02cc46d4ff37072d6fea4cc2841f5c2f3bc (patch) | |
tree | 7ce030afeaa351ba4f7c046e374c4e00054775a3 /api | |
parent | e699acb808201c160ecfcdad08e1506cd87d174b (diff) | |
parent | 1055d8f4a116cdbdb3cf38ecf4781c7fa761d7bd (diff) | |
download | chat-9105b02cc46d4ff37072d6fea4cc2841f5c2f3bc.tar.gz chat-9105b02cc46d4ff37072d6fea4cc2841f5c2f3bc.tar.bz2 chat-9105b02cc46d4ff37072d6fea4cc2841f5c2f3bc.zip |
Merge pull request #285 from hmhealey/mm1738
MM-1787 Fixed team API to properly provide team names for the Find My Team email
Diffstat (limited to 'api')
-rw-r--r-- | api/team.go | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/api/team.go b/api/team.go index c9fe42ecc..01c8e50b6 100644 --- a/api/team.go +++ b/api/team.go @@ -275,11 +275,24 @@ func emailTeams(c *Context, w http.ResponseWriter, r *http.Request) { subjectPage := NewServerTemplatePage("find_teams_subject", c.GetSiteURL()) bodyPage := NewServerTemplatePage("find_teams_body", c.GetSiteURL()) - if err := utils.SendMail(email, subjectPage.Render(), bodyPage.Render()); err != nil { - l4g.Error("An error occured while sending an email in emailTeams err=%v", err) - } + if result := <-Srv.Store.Team().GetTeamsForEmail(email); result.Err != nil { + c.Err = result.Err + } else { + teams := result.Data.([]*model.Team) - w.Write([]byte(model.MapToJson(m))) + // the template expects Props to be a map with team names as the keys + props := make(map[string]string) + for _, team := range teams { + props[team.Name] = team.Name + } + bodyPage.Props = props + + if err := utils.SendMail(email, subjectPage.Render(), bodyPage.Render()); err != nil { + l4g.Error("An error occured while sending an email in emailTeams err=%v", err) + } + + w.Write([]byte(model.MapToJson(m))) + } } func inviteMembers(c *Context, w http.ResponseWriter, r *http.Request) { |