Skip to content
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

Don't fail silently if trying to add a collaborator twice #4533

Merged
merged 7 commits into from
Aug 7, 2018
Merged

Don't fail silently if trying to add a collaborator twice #4533

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d3d6096
don't fail silently if trying to add a collaborator twice
adelowo Jul 28, 2018
b3448f9
fix translation text
adelowo Jul 29, 2018
6d36ff7
added collaborator test
adelowo Jul 29, 2018
61cb9b9
improvee testcases
adelowo Jul 29, 2018
618dabd
Added tests to make sure a collaborator cannot be added twice
adelowo Aug 6, 2018
b174273
Merge remote-tracking branch 'origin/master' into fail_if_collaborato…
adelowo Aug 6, 2018
3b9c163
Merge branch 'master' into fail_if_collaborator_already_exists
lunny Aug 6, 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 @@ -1014,6 +1014,7 @@ settings.transfer_succeed = The repository has been transferred.
settings.confirm_delete = Delete Repository
settings.add_collaborator = Add Collaborator
settings.add_collaborator_success = The collaborator has been added.
settings.add_collaborator_duplicate = The collaborator has been previously added.
Copy link
Member

@lafriks lafriks Jul 28, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Message should be: The collaborator is already added to this repository.

settings.delete_collaborator = Remove
settings.collaborator_deletion = Remove Collaborator
settings.collaborator_deletion_desc = Removing a collaborator will revoke their access to this repository. Continue?
Expand Down
6 changes: 6 additions & 0 deletions routers/repo/setting.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,6 +401,12 @@ func CollaborationPost(ctx *context.Context) {
}
}

if got, err := ctx.Repo.Repository.IsCollaborator(u.ID); err == nil && got {
ctx.Flash.Error(ctx.Tr("repo.settings.add_collaborator_duplicate"))
ctx.Redirect(ctx.Repo.RepoLink + "/settings/collaboration")
return
}

if err = ctx.Repo.Repository.AddCollaborator(u); err != nil {
ctx.ServerError("AddCollaborator", err)
return
Expand Down