Admin should be able to see all organizations

This is follow-up for 56c66ee486 allowing admin
to see private repositories, even when not being member of them.
This commit is contained in:
Adam Strzelecki 2015-11-28 22:31:06 +01:00
parent ca96e04e5f
commit e57b2dffa4
3 changed files with 11 additions and 5 deletions

View file

@ -48,7 +48,12 @@ func HandleOrgAssignment(ctx *Context, args ...bool) {
return
}
if ctx.IsSigned {
// Admin has super access.
if ctx.IsSigned && ctx.User.IsAdmin {
ctx.Org.IsOwner = true
ctx.Org.IsMember = true
ctx.Org.IsAdminTeam = true
} else if ctx.IsSigned {
ctx.Org.IsOwner = org.IsOwnedBy(ctx.User.Id)
if ctx.Org.IsOwner {
ctx.Org.IsMember = true
@ -68,6 +73,7 @@ func HandleOrgAssignment(ctx *Context, args ...bool) {
return
}
ctx.Data["IsOrganizationOwner"] = ctx.Org.IsOwner
ctx.Data["IsOrganizationMember"] = ctx.Org.IsMember
ctx.Org.OrgLink = setting.AppSubUrl + "/org/" + org.Name
ctx.Data["OrgLink"] = ctx.Org.OrgLink