lianguan/gitea
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2069 from nanoant/patch/admin-see-all-organizations

Browse Source 
Admin should be able to see all organizations
This commit is contained in:
Unknwon
2015-11-30 21:18:33 -05:00
parent d3a5ff7b6b e57b2dffa4
commit 117afe7620
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/middleware/org.go
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