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

fix #1302

Browse source
This commit is contained in:
Unknwon 2015-11-13 17:37:02 -05:00
parent 1d57f0d64f
commit f8ae161c74
3 changed files with 29 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
routers/api/v1/repo.go
View file

@ -106,9 +106,9 @@ func ListMyRepos(ctx *middleware.Context) {
}
numOwnRepos := len(ownRepos)
accessibleRepos, err := ctx.User.GetAccessibleRepositories()
accessibleRepos, err := ctx.User.GetRepositoryAccesses()
if err != nil {
ctx.APIError(500, "GetAccessibleRepositories", err)
ctx.APIError(500, "GetRepositoryAccesses", err)
return
}

20
routers/user/home.go
View file

@ -62,23 +62,21 @@ func Dashboard(ctx *middleware.Context) {
return
}
// Check context type.
if !ctxUser.IsOrganization() {
// Normal user.
ctxUser = ctx.User
collaborates, err := ctx.User.GetAccessibleRepositories()
collaborateRepos, err := ctx.User.GetAccessibleRepositories()
if err != nil {
ctx.Handle(500, "GetAccessibleRepositories", err)
return
}
repositories := make([]*models.Repository, 0, len(collaborates))
for repo := range collaborates {
repositories = append(repositories, repo)
for i := range collaborateRepos {
if err = collaborateRepos[i].GetOwner(); err != nil {
ctx.Handle(500, "GetOwner: "+collaborateRepos[i].Name, err)
return
}
}
ctx.Data["CollaborateCount"] = len(repositories)
ctx.Data["CollaborativeRepos"] = repositories
ctx.Data["CollaborateCount"] = len(collaborateRepos)
ctx.Data["CollaborativeRepos"] = collaborateRepos
}
repos, err := models.GetRepositories(ctxUser.Id, true)
@ -89,7 +87,7 @@ func Dashboard(ctx *middleware.Context) {
ctx.Data["Repos"] = repos
// Get mirror repositories.
mirrors := make([]*models.Repository, 0, len(repos)/2)
mirrors := make([]*models.Repository, 0, 5)
for _, repo := range repos {
if repo.IsMirror {
if err = repo.GetMirror(); err != nil {