From cebb4bef843e848531bdf3465f49bd0d995efa8e Mon Sep 17 00:00:00 2001 From: JoramWilander Date: Mon, 29 Jun 2015 09:07:13 -0400 Subject: move default channel creation to seperate func and add off-topic --- api/team.go | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'api/team.go') diff --git a/api/team.go b/api/team.go index 775bc29ae..e4206505d 100644 --- a/api/team.go +++ b/api/team.go @@ -146,12 +146,7 @@ func createTeamFromSignup(c *Context, w http.ResponseWriter, r *http.Request) { } else { rteam := result.Data.(*model.Team) - channel := &model.Channel{DisplayName: "Town Square", Name: "town-square", Type: model.CHANNEL_OPEN, TeamId: rteam.Id} - - if _, err := CreateChannel(c, channel, r.URL.Path, false); err != nil { - c.Err = err - return - } + CreateDefaultChannels(c, rteam.Id) teamSignup.User.TeamId = rteam.Id teamSignup.User.EmailVerified = true @@ -197,12 +192,7 @@ func createTeam(c *Context, w http.ResponseWriter, r *http.Request) { } else { rteam := result.Data.(*model.Team) - channel := &model.Channel{DisplayName: "Town Square", Name: "town-square", Type: model.CHANNEL_OPEN, TeamId: rteam.Id} - - if _, err := CreateChannel(c, channel, r.URL.Path, false); err != nil { - c.Err = err - return - } + CreateDefaultChannels(c, rteam.Id) if rteam.AllowValet { CreateValet(c, rteam) -- cgit v1.2.3-1-g7c22 From d00f90d10c60c82fb74444c3c1118b380d149118 Mon Sep 17 00:00:00 2001 From: JoramWilander Date: Mon, 29 Jun 2015 10:24:45 -0400 Subject: new users now join off-topic defaultly --- api/team.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'api/team.go') diff --git a/api/team.go b/api/team.go index e4206505d..b776fc5ee 100644 --- a/api/team.go +++ b/api/team.go @@ -146,7 +146,10 @@ func createTeamFromSignup(c *Context, w http.ResponseWriter, r *http.Request) { } else { rteam := result.Data.(*model.Team) - CreateDefaultChannels(c, rteam.Id) + if _, err := CreateDefaultChannels(c, rteam.Id); err != nil { + c.Err = nil + return + } teamSignup.User.TeamId = rteam.Id teamSignup.User.EmailVerified = true @@ -192,7 +195,10 @@ func createTeam(c *Context, w http.ResponseWriter, r *http.Request) { } else { rteam := result.Data.(*model.Team) - CreateDefaultChannels(c, rteam.Id) + if _, err := CreateDefaultChannels(c, rteam.Id); err != nil { + c.Err = nil + return + } if rteam.AllowValet { CreateValet(c, rteam) -- cgit v1.2.3-1-g7c22 From 6cfccf63d5e3c7cf3a8ff8795c8f1e63e63cfbf0 Mon Sep 17 00:00:00 2001 From: Reed Garmsen Date: Mon, 29 Jun 2015 09:42:12 -0700 Subject: Changed invite email to reflect the sender's status in the team (e.g. admin v.s. plain member) --- api/team.go | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'api/team.go') diff --git a/api/team.go b/api/team.go index 775bc29ae..24b7ec9e1 100644 --- a/api/team.go +++ b/api/team.go @@ -488,12 +488,21 @@ func InviteMembers(team *model.Team, user *model.User, invites []string) { } else { sender = user.FullName } + + senderRole := "" + if strings.Contains(user.Roles, model.ROLE_ADMIN) || strings.Contains(user.Roles, model.ROLE_SYSTEM_ADMIN) { + senderRole = "administrator" + } else { + senderRole = "member" + } + subjectPage := NewServerTemplatePage("invite_subject", teamUrl) subjectPage.Props["SenderName"] = sender subjectPage.Props["TeamName"] = team.Name bodyPage := NewServerTemplatePage("invite_body", teamUrl) bodyPage.Props["TeamName"] = team.Name bodyPage.Props["SenderName"] = sender + bodyPage.Props["SenderStatus"] = senderRole bodyPage.Props["Email"] = invite -- cgit v1.2.3-1-g7c22