From ab6ef954b4acbd30ba87c2a7680e7843b946adca Mon Sep 17 00:00:00 2001 From: Tsilavina Razafinirina Date: Mon, 20 Nov 2017 18:15:33 +0300 Subject: PLT-6217 Fixes system message posted to Town Square when a member leaves a team (#7752) * Fixes system message posted to Town Square when adding/removing team member (#6483) Fixes unit test method call to match RemoveUserFromTeam modification (#6483) Fixes system message posted to Town Square when adding/removing team member (#6483) Removes unnessary error message * Updates system message when a user leaves a team (#6483) * Changes system message when a user is removed from team (#6483) * Adds a new string to be post to town-square when a member is added to a team (#6483) --- api4/team.go | 2 +- api4/team_test.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'api4') diff --git a/api4/team.go b/api4/team.go index fe5d7a266..858579b4a 100644 --- a/api4/team.go +++ b/api4/team.go @@ -458,7 +458,7 @@ func removeTeamMember(c *Context, w http.ResponseWriter, r *http.Request) { } } - if err := c.App.RemoveUserFromTeam(c.Params.TeamId, c.Params.UserId); err != nil { + if err := c.App.RemoveUserFromTeam(c.Params.TeamId, c.Params.UserId, c.Session.UserId); err != nil { c.Err = err return } diff --git a/api4/team_test.go b/api4/team_test.go index da2f42369..91dc059da 100644 --- a/api4/team_test.go +++ b/api4/team_test.go @@ -1238,7 +1238,7 @@ func TestAddTeamMember(t *testing.T) { team := th.BasicTeam otherUser := th.CreateUser() - if err := th.App.RemoveUserFromTeam(th.BasicTeam.Id, th.BasicUser2.Id); err != nil { + if err := th.App.RemoveUserFromTeam(th.BasicTeam.Id, th.BasicUser2.Id, ""); err != nil { t.Fatalf(err.Error()) } @@ -1454,7 +1454,7 @@ func TestAddTeamMembers(t *testing.T) { otherUser.Id, } - if err := th.App.RemoveUserFromTeam(th.BasicTeam.Id, th.BasicUser2.Id); err != nil { + if err := th.App.RemoveUserFromTeam(th.BasicTeam.Id, th.BasicUser2.Id, ""); err != nil { t.Fatalf(err.Error()) } -- cgit v1.2.3-1-g7c22