diff options
| author | Christopher Speller <crspeller@gmail.com> | 2016-05-17 17:51:42 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-05-17 17:51:42 -0400 |
| commit | edd453c6cd6daf1b4c6e1ea7ce2721db16e25214 (patch) | |
| tree | b5d616a061d949fc894fe07f03c06d2b20338476 /store/sql_team_store.go | |
| parent | 0fe75cb7826944a3352705d5e78eba1d12cc213a (diff) | |
| parent | ac509b114df1c1b4b841eded74fb797805e0162d (diff) | |
| download | chat-edd453c6cd6daf1b4c6e1ea7ce2721db16e25214.tar.gz chat-edd453c6cd6daf1b4c6e1ea7ce2721db16e25214.tar.bz2 chat-edd453c6cd6daf1b4c6e1ea7ce2721db16e25214.zip | |
Merge branch 'release-3.0'
Diffstat (limited to 'store/sql_team_store.go')
| -rw-r--r-- | store/sql_team_store.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/store/sql_team_store.go b/store/sql_team_store.go index daaa1bac1..a9f265273 100644 --- a/store/sql_team_store.go +++ b/store/sql_team_store.go @@ -68,7 +68,7 @@ func (s SqlTeamStore) Save(team *model.Team) StoreChannel { } if err := s.GetMaster().Insert(team); err != nil { - if IsUniqueConstraintError(err.Error(), "Name", "teams_name_key") { + if IsUniqueConstraintError(err.Error(), []string{"Name", "teams_name_key"}) { result.Err = model.NewLocAppError("SqlTeamStore.Save", "store.sql_team.save.domain_exists.app_error", nil, "id="+team.Id+", "+err.Error()) } else { result.Err = model.NewLocAppError("SqlTeamStore.Save", "store.sql_team.save.app_error", nil, "id="+team.Id+", "+err.Error()) @@ -370,7 +370,7 @@ func (s SqlTeamStore) SaveMember(member *model.TeamMember) StoreChannel { } if err := s.GetMaster().Insert(member); err != nil { - if IsUniqueConstraintError(err.Error(), "TeamId", "teammembers_pkey") { + 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()) } 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()) |