From 11b1498a6e7e01c32d7d802e4d149393b4efb9a9 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Wed, 21 Jun 2017 17:41:18 -0400 Subject: api/repo: load attributes when listing user repositories (#4565) --- models/access.go | 6 ++---- models/repo.go | 2 ++ 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'models') diff --git a/models/access.go b/models/access.go index 54816c7b..df3cd766 100644 --- a/models/access.go +++ b/models/access.go @@ -112,14 +112,12 @@ func (u *User) GetRepositoryAccesses() (map[*Repository]AccessMode, error) { repo, err := GetRepositoryByID(access.RepoID) if err != nil { if errors.IsRepoNotExist(err) { - log.Error(4, "GetRepositoryByID: %v", err) + log.Error(2, "GetRepositoryByID: %v", err) continue } return nil, err } - if err = repo.GetOwner(); err != nil { - return nil, err - } else if repo.OwnerID == u.ID { + if repo.OwnerID == u.ID { continue } repos[repo] = access.Mode diff --git a/models/repo.go b/models/repo.go index 5bdd565a..88932449 100644 --- a/models/repo.go +++ b/models/repo.go @@ -282,6 +282,8 @@ func (repo *Repository) HTMLURL() string { return setting.AppURL + repo.FullName() } +// This method assumes following fields have been assigned with valid values: +// Required - BaseRepo (if fork) // Arguments that are allowed to be nil: permission func (repo *Repository) APIFormat(permission *api.Permission) *api.Repository { cloneLink := repo.CloneLink() -- cgit v1.2.3