diff options
| author | Unknwon <u@gogs.io> | 2017-06-21 17:41:18 -0400 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2017-06-21 17:41:18 -0400 |
| commit | 11b1498a6e7e01c32d7d802e4d149393b4efb9a9 (patch) | |
| tree | ad308322185e34a7e8e0af78a8a163181269bb68 /models | |
| parent | f59500a90bd688f99cde8820274807a581eead25 (diff) | |
api/repo: load attributes when listing user repositories (#4565)
Diffstat (limited to 'models')
| -rw-r--r-- | models/access.go | 6 | ||||
| -rw-r--r-- | models/repo.go | 2 |
2 files changed, 4 insertions, 4 deletions
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() |