finn/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Only show teams the user has access to

Browse source
This commit is contained in:
Florian Kaiser 2016-01-31 13:28:42 +00:00
parent 5eafe2b17e
commit e35791b2b2
6 changed files with 84 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

5
routers/org/teams.go
View file

@ -28,10 +28,7 @@ func Teams(ctx *middleware.Context) {
ctx.Data["Title"] = org.FullName
ctx.Data["PageIsOrgTeams"] = true
if err := org.GetTeams(); err != nil {
ctx.Handle(500, "GetTeams", err)
return
}
// org.Teams is already loaded by middleware
for _, t := range org.Teams {
if err := t.GetMembers(); err != nil {
ctx.Handle(500, "GetMembers", err)

9
routers/user/home.go
View file

@ -312,9 +312,10 @@ func showOrgProfile(ctx *middleware.Context) {
}
org := ctx.Org.Organization
userId := ctx.User.Id
ctx.Data["Title"] = org.FullName
if err := org.GetUserRepositories(ctx.User.Id); err != nil {
if err := org.GetUserRepositories(userId); err != nil {
ctx.Handle(500, "GetUserRepositories", err)
return
}
@ -326,11 +327,7 @@ func showOrgProfile(ctx *middleware.Context) {
}
ctx.Data["Members"] = org.Members
if err := org.GetTeams(); err != nil {
ctx.Handle(500, "GetTeams", err)
return
}
ctx.Data["Teams"] = org.Teams
ctx.Data["Teams"] = org.Teams // already loaded by middleware
ctx.HTML(200, ORG_HOME)
}