From 68c2b070da59bd2cf9c5cd91901a4e3bf6084061 Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Tue, 7 Jun 2016 17:43:06 -0400 Subject: Auto join teams if coming from team sign-up page to login for GitLab (#3284) --- store/sql_team_store.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'store') diff --git a/store/sql_team_store.go b/store/sql_team_store.go index 6e1deeb20..c668988dc 100644 --- a/store/sql_team_store.go +++ b/store/sql_team_store.go @@ -10,6 +10,10 @@ import ( "github.com/mattermost/platform/utils" ) +const ( + TEAM_MEMBER_EXISTS_ERROR = "store.sql_team.save_member.exists.app_error" +) + type SqlTeamStore struct { *SqlStore } @@ -372,8 +376,8 @@ func (s SqlTeamStore) SaveMember(member *model.TeamMember) StoreChannel { } if err := s.GetMaster().Insert(member); err != nil { - if IsUniqueConstraintError(err.Error(), []string{"TeamId", "teammembers_pkey"}) { - result.Err = model.NewLocAppError("SqlTeamStore.SaveMember", "store.sql_team.save_member.exists.app_error", nil, "team_id="+member.TeamId+", user_id="+member.UserId+", "+err.Error()) + if IsUniqueConstraintError(err.Error(), []string{"TeamId", "teammembers_pkey", "PRIMARY"}) { + result.Err = model.NewLocAppError("SqlTeamStore.SaveMember", TEAM_MEMBER_EXISTS_ERROR, nil, "team_id="+member.TeamId+", user_id="+member.UserId+", "+err.Error()) } else { result.Err = model.NewLocAppError("SqlTeamStore.SaveMember", "store.sql_team.save_member.save.app_error", nil, "team_id="+member.TeamId+", user_id="+member.UserId+", "+err.Error()) } -- cgit v1.2.3-1-g7c22