From e35791b2b2888979ba53b8a9a58e1cb132026914 Mon Sep 17 00:00:00 2001
From: Florian Kaiser <florian.kaiser@fnkr.net>
Date: Sun, 31 Jan 2016 13:28:42 +0000
Subject: Only show teams the user has access to

---
 modules/middleware/context.go |  1 +
 modules/middleware/org.go     | 60 +++++++++++++++++++++++++++++++------------
 2 files changed, 45 insertions(+), 16 deletions(-)

(limited to 'modules/middleware')

diff --git a/modules/middleware/context.go b/modules/middleware/context.go
index d58967b8..59e95aad 100644
--- a/modules/middleware/context.go
+++ b/modules/middleware/context.go
@@ -65,6 +65,7 @@ type Context struct {
 	Org struct {
 		IsOwner      bool
 		IsMember     bool
+		IsTeamMember bool // Is member of team.
 		IsAdminTeam  bool // In owner team or team that has admin permission level.
 		Organization *models.User
 		OrgLink      string
diff --git a/modules/middleware/org.go b/modules/middleware/org.go
index 37ba4deb..34ec90dc 100644
--- a/modules/middleware/org.go
+++ b/modules/middleware/org.go
@@ -5,6 +5,8 @@
 package middleware
 
 import (
+	"strings"
+
 	"gopkg.in/macaron.v1"
 
 	"github.com/gogits/gogs/models"
@@ -13,9 +15,10 @@ import (
 
 func HandleOrgAssignment(ctx *Context, args ...bool) {
 	var (
-		requireMember    bool
-		requireOwner     bool
-		requireAdminTeam bool
+		requireMember     bool
+		requireOwner      bool
+		requireTeamMember bool
+		requireAdminTeam  bool
 	)
 	if len(args) >= 1 {
 		requireMember = args[0]
@@ -24,7 +27,10 @@ func HandleOrgAssignment(ctx *Context, args ...bool) {
 		requireOwner = args[1]
 	}
 	if len(args) >= 3 {
-		requireAdminTeam = args[2]
+		requireTeamMember = args[2]
+	}
+	if len(args) >= 4 {
+		requireAdminTeam = args[3]
 	}
 
 	orgName := ctx.Params(":org")
@@ -52,11 +58,13 @@ func HandleOrgAssignment(ctx *Context, args ...bool) {
 	if ctx.IsSigned && ctx.User.IsAdmin {
 		ctx.Org.IsOwner = true
 		ctx.Org.IsMember = true
+		ctx.Org.IsTeamMember = 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
+			ctx.Org.IsTeamMember = true
 			ctx.Org.IsAdminTeam = true
 		} else {
 			if org.IsOrgMember(ctx.User.Id) {
@@ -79,25 +87,45 @@ func HandleOrgAssignment(ctx *Context, args ...bool) {
 	ctx.Data["OrgLink"] = ctx.Org.OrgLink
 
 	// Team.
+	if ctx.Org.IsMember {
+		if err := org.GetUserTeams(ctx.User.Id); err != nil {
+			ctx.Handle(500, "GetUserTeams", err)
+			return
+		}
+	}
+
 	teamName := ctx.Params(":team")
 	if len(teamName) > 0 {
-		ctx.Org.Team, err = org.GetTeam(teamName)
-		if err != nil {
-			if err == models.ErrTeamNotExist {
-				ctx.Handle(404, "GetTeam", err)
-			} else {
-				ctx.Handle(500, "GetTeam", err)
+		teamExists := false
+		for _, team := range org.Teams {
+			if strings.ToLower(team.Name) == strings.ToLower(teamName) {
+				teamExists = true
+				ctx.Org.Team = team
+				ctx.Org.IsTeamMember = true
+				ctx.Data["Team"] = ctx.Org.Team
+				break
 			}
+		}
+
+		if !teamExists {
+			ctx.Handle(404, "OrgAssignment", err)
+			return
+		}
+
+		ctx.Data["IsTeamMember"] = ctx.Org.IsTeamMember
+		if requireTeamMember && !ctx.Org.IsTeamMember {
+			ctx.Handle(404, "OrgAssignment", err)
 			return
 		}
-		ctx.Data["Team"] = ctx.Org.Team
+
 		ctx.Org.IsAdminTeam = ctx.Org.Team.IsOwnerTeam() || ctx.Org.Team.Authorize >= models.ACCESS_MODE_ADMIN
+		ctx.Data["IsAdminTeam"] = ctx.Org.IsAdminTeam
+		if requireAdminTeam && !ctx.Org.IsAdminTeam {
+			ctx.Handle(404, "OrgAssignment", err)
+			return
+		}
 	}
-	ctx.Data["IsAdminTeam"] = ctx.Org.IsAdminTeam
-	if requireAdminTeam && !ctx.Org.IsAdminTeam {
-		ctx.Handle(404, "OrgAssignment", err)
-		return
-	}
+
 }
 
 func OrgAssignment(args ...bool) macaron.Handler {
-- 
cgit v1.2.3


From 8c4588c4c9844bb9f5e39df5fcaadca7fd6170cd Mon Sep 17 00:00:00 2001
From: Florian Kaiser <florian.kaiser@fnkr.net>
Date: Sun, 31 Jan 2016 15:18:28 +0000
Subject: Refactor .IsAdminTeam to .IsTeamAdmin and requireAdminTeam to
 requireTeamAdmin

---
 modules/middleware/context.go |  2 +-
 modules/middleware/org.go     | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'modules/middleware')

diff --git a/modules/middleware/context.go b/modules/middleware/context.go
index 59e95aad..cd11c08b 100644
--- a/modules/middleware/context.go
+++ b/modules/middleware/context.go
@@ -66,7 +66,7 @@ type Context struct {
 		IsOwner      bool
 		IsMember     bool
 		IsTeamMember bool // Is member of team.
-		IsAdminTeam  bool // In owner team or team that has admin permission level.
+		IsTeamAdmin  bool // In owner team or team that has admin permission level.
 		Organization *models.User
 		OrgLink      string
 
diff --git a/modules/middleware/org.go b/modules/middleware/org.go
index 34ec90dc..99c4cf9d 100644
--- a/modules/middleware/org.go
+++ b/modules/middleware/org.go
@@ -18,7 +18,7 @@ func HandleOrgAssignment(ctx *Context, args ...bool) {
 		requireMember     bool
 		requireOwner      bool
 		requireTeamMember bool
-		requireAdminTeam  bool
+		requireTeamAdmin  bool
 	)
 	if len(args) >= 1 {
 		requireMember = args[0]
@@ -30,7 +30,7 @@ func HandleOrgAssignment(ctx *Context, args ...bool) {
 		requireTeamMember = args[2]
 	}
 	if len(args) >= 4 {
-		requireAdminTeam = args[3]
+		requireTeamAdmin = args[3]
 	}
 
 	orgName := ctx.Params(":org")
@@ -59,13 +59,13 @@ func HandleOrgAssignment(ctx *Context, args ...bool) {
 		ctx.Org.IsOwner = true
 		ctx.Org.IsMember = true
 		ctx.Org.IsTeamMember = true
-		ctx.Org.IsAdminTeam = true
+		ctx.Org.IsTeamAdmin = true
 	} else if ctx.IsSigned {
 		ctx.Org.IsOwner = org.IsOwnedBy(ctx.User.Id)
 		if ctx.Org.IsOwner {
 			ctx.Org.IsMember = true
 			ctx.Org.IsTeamMember = true
-			ctx.Org.IsAdminTeam = true
+			ctx.Org.IsTeamAdmin = true
 		} else {
 			if org.IsOrgMember(ctx.User.Id) {
 				ctx.Org.IsMember = true
@@ -118,9 +118,9 @@ func HandleOrgAssignment(ctx *Context, args ...bool) {
 			return
 		}
 
-		ctx.Org.IsAdminTeam = ctx.Org.Team.IsOwnerTeam() || ctx.Org.Team.Authorize >= models.ACCESS_MODE_ADMIN
-		ctx.Data["IsAdminTeam"] = ctx.Org.IsAdminTeam
-		if requireAdminTeam && !ctx.Org.IsAdminTeam {
+		ctx.Org.IsTeamAdmin = ctx.Org.Team.IsOwnerTeam() || ctx.Org.Team.Authorize >= models.ACCESS_MODE_ADMIN
+		ctx.Data["IsTeamAdmin"] = ctx.Org.IsTeamAdmin
+		if requireTeamAdmin && !ctx.Org.IsTeamAdmin {
 			ctx.Handle(404, "OrgAssignment", err)
 			return
 		}
-- 
cgit v1.2.3


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(-)

(limited to 'modules/middleware')

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