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 /api/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 'api/team.go')
| -rw-r--r-- | api/team.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/api/team.go b/api/team.go index dda3b9d9d..ed46947a4 100644 --- a/api/team.go +++ b/api/team.go @@ -61,7 +61,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 @@ -131,7 +131,7 @@ func inviteMembers(c *Context, w http.ResponseWriter, r *http.Request) { return } - if err := app.InviteNewUsersToTeam(invites.ToEmailList(), c.TeamId, c.Session.UserId, c.GetSiteURL()); err != nil { + if err := app.InviteNewUsersToTeam(invites.ToEmailList(), c.TeamId, c.Session.UserId); err != nil { c.Err = err return } @@ -153,7 +153,7 @@ func addUserToTeam(c *Context, w http.ResponseWriter, r *http.Request) { return } - if _, err := app.AddUserToTeam(c.TeamId, userId, c.GetSiteURL()); err != nil { + if _, err := app.AddUserToTeam(c.TeamId, userId); err != nil { c.Err = err return } @@ -195,9 +195,9 @@ func addUserToTeamFromInvite(c *Context, w http.ResponseWriter, r *http.Request) var err *model.AppError if len(hash) > 0 { - team, err = app.AddUserToTeamByHash(c.Session.UserId, hash, data, c.GetSiteURL()) + team, err = app.AddUserToTeamByHash(c.Session.UserId, hash, data) } else if len(inviteId) > 0 { - team, err = app.AddUserToTeamByInviteId(inviteId, c.Session.UserId, c.GetSiteURL()) + team, err = app.AddUserToTeamByInviteId(inviteId, c.Session.UserId) } else { c.Err = model.NewLocAppError("addUserToTeamFromInvite", "api.user.create_user.signup_link_invalid.app_error", nil, "") return |