From 9cf95e4e37419fd2856ec941922b5a0c74d155e1 Mon Sep 17 00:00:00 2001
From: Florian Kaiser <florian.kaiser@fnkr.net>
Date: Sun, 31 Jan 2016 16:13:31 +0000
Subject: Organization owners see all repositories & teams
---
modules/middleware/org.go | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/modules/middleware/org.go b/modules/middleware/org.go
index 99c4cf9d..eb71020e 100644
--- a/modules/middleware/org.go
+++ b/modules/middleware/org.go
@@ -88,9 +88,16 @@ func HandleOrgAssignment(ctx *Context, args ...bool) {
// Team.
if ctx.Org.IsMember {
- if err := org.GetUserTeams(ctx.User.Id); err != nil {
- ctx.Handle(500, "GetUserTeams", err)
- return
+ if ctx.Org.IsOwner {
+ if err := org.GetTeams(); err != nil {
+ 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 {
teamExists := false
for _, team := range org.Teams {
+
if strings.ToLower(team.Name) == strings.ToLower(teamName) {
teamExists = true
ctx.Org.Team = team
@@ -125,7 +133,6 @@ func HandleOrgAssignment(ctx *Context, args ...bool) {
return
}
}
-
}
func OrgAssignment(args ...bool) macaron.Handler {
--
cgit v1.2.3