Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 19, 2018
Merged

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

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8832b28
Report error if you are trying to add a user twice
adelowo Aug 18, 2018
1cde78a
Remove duplication declaration
adelowo Aug 18, 2018
f1b243b
Merge branch 'master' into display_error_when_adding_duplicate_users
lafriks Aug 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions options/locale/locale_en-US.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 6 additions & 1 deletion routers/org/teams.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,12 @@ func TeamsAction(ctx *context.Context) {
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"
}

Expand Down