From 3611a3e5529329c9ab1a137c0930199959a40e71 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Fri, 26 May 2017 21:12:02 +0800 Subject: fix bug to deny to add orgnization as a member of an orgnization or team (#1815) --- routers/org/members.go | 6 ++++++ routers/org/teams.go | 6 ++++++ 2 files changed, 12 insertions(+) (limited to 'routers') diff --git a/routers/org/members.go b/routers/org/members.go index 70e4161c00..1b74b5f740 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 914561b52a..10c86bd5cf 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" } -- cgit v1.2.3