From 8832b289e17550b1f428da118ceb78cf155e8536 Mon Sep 17 00:00:00 2001 From: Lanre Adelowo Date: Sat, 18 Aug 2018 16:39:42 +0100 Subject: [PATCH 1/2] Report error if you are trying to add a user twice --- options/locale/locale_en-US.ini | 1 + routers/org/teams.go | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 7779f1e96b0d0..c68cdd08e43ce 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1312,6 +1312,7 @@ teams.search_repo_placeholder = Search repository… teams.add_team_repository = Add Team Repository teams.remove_repo = Remove teams.add_nonexistent_repo = "The repository you're trying to add does not exist; please create it first." +teams.add_duplicate_users = User is already a team member. [admin] dashboard = Dashboard diff --git a/routers/org/teams.go b/routers/org/teams.go index 87bfb8596a8e5..31d3275e205db 100644 --- a/routers/org/teams.go +++ b/routers/org/teams.go @@ -96,8 +96,13 @@ func TeamsAction(ctx *context.Context) { return } - err = ctx.Org.Team.AddMember(u.ID) - page = "team" + if ctx.Org.Team.IsMember(u.ID) { + ctx.Flash.Error(ctx.Tr("org.teams.add_duplicate_users")) + page = "team" + } else { + err = ctx.Org.Team.AddMember(u.ID) + page = "team" + } } if err != nil { From 1cde78a277a6c35581d194a3efa490482ca8f23b Mon Sep 17 00:00:00 2001 From: Lanre Adelowo Date: Sat, 18 Aug 2018 16:46:23 +0100 Subject: [PATCH 2/2] Remove duplication declaration --- routers/org/teams.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/routers/org/teams.go b/routers/org/teams.go index 31d3275e205db..da6d81938aa9f 100644 --- a/routers/org/teams.go +++ b/routers/org/teams.go @@ -98,11 +98,11 @@ func TeamsAction(ctx *context.Context) { if ctx.Org.Team.IsMember(u.ID) { ctx.Flash.Error(ctx.Tr("org.teams.add_duplicate_users")) - page = "team" } else { err = ctx.Org.Team.AddMember(u.ID) - page = "team" } + + page = "team" } if err != nil {