coolaj86
/
gitroast
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Organization owners see all repositories & teams

This commit is contained in:
Florian Kaiser 2016-01-31 16:13:31 +00:00
parent 8c4588c4c9
commit 9cf95e4e37
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modules/middleware/org.go
View File

@ -88,9 +88,16 @@ func HandleOrgAssignment(ctx *Context, args ...bool) {
// Team. // Team.
if ctx.Org.IsMember { if ctx.Org.IsMember {
if err := org.GetUserTeams(ctx.User.Id); err != nil { if ctx.Org.IsOwner {
ctx.Handle(500, "GetUserTeams", err) if err := org.GetTeams(); err != nil {
return ctx.Handle(500, "GetUserTeams", err)
return
}
} else {
if err := org.GetUserTeams(ctx.User.Id); err != nil {
ctx.Handle(500, "GetUserTeams", err)
return
}
} }
} }
@ -98,6 +105,7 @@ func HandleOrgAssignment(ctx *Context, args ...bool) {
if len(teamName) > 0 { if len(teamName) > 0 {
teamExists := false teamExists := false
for _, team := range org.Teams { for _, team := range org.Teams {
if strings.ToLower(team.Name) == strings.ToLower(teamName) { if strings.ToLower(team.Name) == strings.ToLower(teamName) {
teamExists = true teamExists = true
ctx.Org.Team = team ctx.Org.Team = team
@ -125,7 +133,6 @@ func HandleOrgAssignment(ctx *Context, args ...bool) {
return return
} }
} }
} }
func OrgAssignment(args ...bool) macaron.Handler { func OrgAssignment(args ...bool) macaron.Handler {