diff options
Diffstat (limited to 'routers')
| -rw-r--r-- | routers/org/teams.go | 5 | ||||
| -rw-r--r-- | routers/user/home.go | 9 |
2 files changed, 4 insertions, 10 deletions
diff --git a/routers/org/teams.go b/routers/org/teams.go index b2128baa..63618b98 100644 --- a/routers/org/teams.go +++ b/routers/org/teams.go @@ -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) diff --git a/routers/user/home.go b/routers/user/home.go index b198e801..fabe7b1f 100644 --- a/routers/user/home.go +++ b/routers/user/home.go @@ -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) } |