From 3611a3e5529329c9ab1a137c0930199959a40e71 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Fri, 26 May 2017 21:12:02 +0800 Subject: [PATCH] fix bug to deny to add orgnization as a member of an orgnization or team (#1815) --- options/locale/locale_en-US.ini | 2 ++ routers/org/members.go | 6 ++++++ routers/org/teams.go | 6 ++++++ 3 files changed, 14 insertions(+) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 62701595b..ab11d6341 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -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. 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. +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_gpg_key = Sorry, we were not able to verify your GPG key: %s diff --git a/routers/org/members.go b/routers/org/members.go index 70e4161c0..1b74b5f74 100644 --- a/routers/org/members.go +++ b/routers/org/members.go @@ -114,6 +114,12 @@ func Invitation(ctx *context.Context) { 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 { ctx.Handle(500, " AddMember", err) return diff --git a/routers/org/teams.go b/routers/org/teams.go index 914561b52..10c86bd5c 100644 --- a/routers/org/teams.go +++ b/routers/org/teams.go @@ -88,6 +88,12 @@ func TeamsAction(ctx *context.Context) { 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) page = "team" }