domi/forgejo-domi
1
0
Fork 0
forked from forgejo/forgejo
Code Pull requests Activity

An inactive user shouldn't be able to be added as a collaborator (#4535)

Browse source 
* an inactive user shouldn't be able to be a collaborator

* use translated error message

* add active user check when adding a new collaborator via the api

* fix translation text

* added collaborator test

* improvee testcases
This commit is contained in:
Lanre Adelowo 2018-08-07 11:01:06 +01:00 • committed by Lauris BH
parent c7a6ee5c0b
commit 59b10e66f7
4 changed files with 39 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
routers/repo/setting.go
View file

@ -381,6 +381,12 @@ func CollaborationPost(ctx *context.Context) {
return
}
if !u.IsActive {
ctx.Flash.Error(ctx.Tr("repo.settings.add_collaborator_inactive_user"))
ctx.Redirect(setting.AppSubURL + ctx.Req.URL.Path)
return
}
// Organization is not allowed to be added as a collaborator.
if u.IsOrganization() {
ctx.Flash.Error(ctx.Tr("repo.settings.org_not_allowed_to_be_collaborator"))