Skip to content

Commit d3d6096

Browse files
committed
don't fail silently if trying to add a collaborator twice
1 parent a74426d commit d3d6096

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

options/locale/locale_en-US.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1014,6 +1014,7 @@ settings.transfer_succeed = The repository has been transferred.
10141014
settings.confirm_delete = Delete Repository
10151015
settings.add_collaborator = Add Collaborator
10161016
settings.add_collaborator_success = The collaborator has been added.
1017+
settings.add_collaborator_duplicate = The collaborator has been previously added.
10171018
settings.delete_collaborator = Remove
10181019
settings.collaborator_deletion = Remove Collaborator
10191020
settings.collaborator_deletion_desc = Removing a collaborator will revoke their access to this repository. Continue?

routers/repo/setting.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -401,6 +401,12 @@ func CollaborationPost(ctx *context.Context) {
401401
}
402402
}
403403

404+
if got, err := ctx.Repo.Repository.IsCollaborator(u.ID); err == nil && got {
405+
ctx.Flash.Error(ctx.Tr("repo.settings.add_collaborator_duplicate"))
406+
ctx.Redirect(ctx.Repo.RepoLink + "/settings/collaboration")
407+
return
408+
}
409+
404410
if err = ctx.Repo.Repository.AddCollaborator(u); err != nil {
405411
ctx.ServerError("AddCollaborator", err)
406412
return

0 commit comments

Comments
 (0)