coolaj86
/
gitroast
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Display error when adding a user to a team twice (#4746)

This commit is contained in:
Lanre Adelowo 2018-08-19 19:49:19 +01:00 committed by Lauris BH
parent b1ad5734c6
commit a6cdda115d
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
options/locale/locale_en-US.ini
View File

@ -1312,6 +1312,7 @@ teams.search_repo_placeholder = Search repository…
teams.add_team_repository = Add Team Repository teams.add_team_repository = Add Team Repository
teams.remove_repo = Remove teams.remove_repo = Remove
teams.add_nonexistent_repo = "The repository you're trying to add does not exist; please create it first." 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] [admin]
dashboard = Dashboard dashboard = Dashboard

7
routers/org/teams.go
View File

@ -96,7 +96,12 @@ func TeamsAction(ctx *context.Context) {
return return
} }
err = ctx.Org.Team.AddMember(u.ID) if ctx.Org.Team.IsMember(u.ID) {
ctx.Flash.Error(ctx.Tr("org.teams.add_duplicate_users"))
} else {
err = ctx.Org.Team.AddMember(u.ID)
}
page = "team" page = "team"
} }