diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2017-04-04 11:54:52 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2017-04-04 11:54:52 -0400 |
| commit | c7bdce8a6641ed8d361a43b6004a351535c78423 (patch) | |
| tree | f42d32d8a4d0cd4f702644dcb6a594f905f3f771 /api4/team.go | |
| parent | 3a79e451ffe3ffe618311ee15b02dbebde6a77b0 (diff) | |
| download | chat-c7bdce8a6641ed8d361a43b6004a351535c78423.tar.gz chat-c7bdce8a6641ed8d361a43b6004a351535c78423.tar.bz2 chat-c7bdce8a6641ed8d361a43b6004a351535c78423.zip | |
PLT-5900 Removed automatic configuration of SiteURL (#5952)
* Revert "PLT-5765 Passed SiteURL to SendNotifications (#5705)"
This reverts commit a8e68bd8905972ae59de90fa33d5b3e3c274dc47.
* Removed automatic configuration of SiteURL
* Reverted unintentional config changes
* Updated help text
* Added link to docs in Site URL warning
* Fixed merge conflict
Diffstat (limited to 'api4/team.go')
| -rw-r--r-- | api4/team.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/api4/team.go b/api4/team.go index 8da308a1c..9bde841ab 100644 --- a/api4/team.go +++ b/api4/team.go @@ -63,7 +63,7 @@ func createTeam(c *Context, w http.ResponseWriter, r *http.Request) { return } - rteam, err := app.CreateTeamWithUser(team, c.Session.UserId, c.GetSiteURL()) + rteam, err := app.CreateTeamWithUser(team, c.Session.UserId) if err != nil { c.Err = err return @@ -349,14 +349,14 @@ func addTeamMember(c *Context, w http.ResponseWriter, r *http.Request) { return } - member, err = app.AddTeamMember(member.TeamId, member.UserId, c.GetSiteURL()) + member, err = app.AddTeamMember(member.TeamId, member.UserId) } else if len(hash) > 0 && len(data) > 0 { - member, err = app.AddTeamMemberByHash(c.Session.UserId, hash, data, c.GetSiteURL()) + member, err = app.AddTeamMemberByHash(c.Session.UserId, hash, data) if err != nil { err = model.NewAppError("addTeamMember", "api.team.add_user_to_team.invalid_data.app_error", nil, "", http.StatusNotFound) } } else if len(inviteId) > 0 { - member, err = app.AddTeamMemberByInviteId(inviteId, c.Session.UserId, c.GetSiteURL()) + member, err = app.AddTeamMemberByInviteId(inviteId, c.Session.UserId) if err != nil { err = model.NewAppError("addTeamMember", "api.team.add_user_to_team.invalid_invite_id.app_error", nil, "", http.StatusNotFound) } @@ -407,7 +407,7 @@ func addTeamMembers(c *Context, w http.ResponseWriter, r *http.Request) { return } - members, err = app.AddTeamMembers(c.Params.TeamId, userIds, c.GetSiteURL()) + members, err = app.AddTeamMembers(c.Params.TeamId, userIds) if err != nil { c.Err = err @@ -673,7 +673,7 @@ func inviteUsersToTeam(c *Context, w http.ResponseWriter, r *http.Request) { return } - err := app.InviteNewUsersToTeam(emailList, c.Params.TeamId, c.Session.UserId, utils.GetSiteURL()) + err := app.InviteNewUsersToTeam(emailList, c.Params.TeamId, c.Session.UserId) if err != nil { c.Err = err return |