diff options
| author | Unknwon <u@gogs.io> | 2015-11-30 21:18:33 -0500 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2015-11-30 21:18:33 -0500 |
| commit | 117afe762061001287d5a8e93c8bcb2d1efbc1ad (patch) | |
| tree | 5750ed8bcdc7fd65de722cec44c5018346fe0888 /modules | |
| parent | d3a5ff7b6b16ea35bd31fcef902b08dcf266de9c (diff) | |
| parent | e57b2dffa42e554810d9b3f027bd8c5e12ba7369 (diff) | |
| download | gitea-117afe762061001287d5a8e93c8bcb2d1efbc1ad.tar.gz gitea-117afe762061001287d5a8e93c8bcb2d1efbc1ad.zip | |
Merge pull request #2069 from nanoant/patch/admin-see-all-organizations
Admin should be able to see all organizations
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/middleware/org.go | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/modules/middleware/org.go b/modules/middleware/org.go index 29754bb929..37ba4deb1f 100644 --- a/modules/middleware/org.go +++ b/modules/middleware/org.go @@ -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 |