foster/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-12-22 12:54:53 -05:00
Code Issues Wiki Activity

fix bug to deny to add orgnization as a member of an orgnization or team (#1815)

Browse source
This commit is contained in:
Lunny Xiao 2017-05-26 21:12:02 +08:00 committed by Bo-Yi Wu
parent 39348cd27e
commit 3611a3e552
3 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
options/locale/locale_en-US.ini
View file

@ -259,6 +259,8 @@ enterred_invalid_owner_name = Please ensure that the owner name you entered is c
enterred_invalid_password = Please ensure the that password you entered is correct. enterred_invalid_password = Please ensure the that password you entered is correct.
user_not_exist = The user does not exist. user_not_exist = The user does not exist.
last_org_owner = Removing the last user from the owner team is not allowed because there must always be at least one owner in any given organization. last_org_owner = Removing the last user from the owner team is not allowed because there must always be at least one owner in any given organization.
cannot_add_org_to_team = Organization cannot be added as a team member.
cannot_invite_org_to_org = Organization cannot be invited as an organization member.
invalid_ssh_key = Sorry, we were not able to verify your SSH key: %s invalid_ssh_key = Sorry, we were not able to verify your SSH key: %s
invalid_gpg_key = Sorry, we were not able to verify your GPG key: %s invalid_gpg_key = Sorry, we were not able to verify your GPG key: %s

6
routers/org/members.go
View file

@ -114,6 +114,12 @@ func Invitation(ctx *context.Context) {
return return
} }
if u.IsOrganization() {
ctx.Flash.Error(ctx.Tr("form.cannot_invite_org_to_org"))
ctx.Redirect(ctx.Org.OrgLink + "/invitations/new")
return
}
if err = org.AddMember(u.ID); err != nil { if err = org.AddMember(u.ID); err != nil {
ctx.Handle(500, " AddMember", err) ctx.Handle(500, " AddMember", err)
return return

6
routers/org/teams.go
View file

@ -88,6 +88,12 @@ func TeamsAction(ctx *context.Context) {
return return
} }
if u.IsOrganization() {
ctx.Flash.Error(ctx.Tr("form.cannot_add_org_to_team"))
ctx.Redirect(ctx.Org.OrgLink + "/teams/" + ctx.Org.Team.LowerName)
return
}
err = ctx.Org.Team.AddMember(u.ID) err = ctx.Org.Team.AddMember(u.ID)
page = "team" page = "team"
} }