IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2026-08-26 21:27:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #285 from hmhealey/mm1738

Browse Source 
MM-1787 Fixed team API to properly provide team names for the Find My Team email
This commit is contained in:
Joram Wilander
2015-07-30 11:31:51 -04:00
parent e699acb808 1055d8f4a1
commit 9105b02cc4
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/team.go
+17 -4
View File
@@ -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) {