diff options
| -rw-r--r-- | gogs.go | 2 | ||||
| -rw-r--r-- | models/access.go | 6 | ||||
| -rw-r--r-- | models/repo.go | 2 | ||||
| -rw-r--r-- | routes/api/v1/repo/repo.go | 6 | ||||
| -rw-r--r-- | templates/.VERSION | 2 |
5 files changed, 12 insertions, 6 deletions
@@ -16,7 +16,7 @@ import ( "github.com/gogits/gogs/pkg/setting" ) -const APP_VER = "0.11.21.0611" +const APP_VER = "0.11.22.0621" func init() { setting.AppVer = APP_VER 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() diff --git a/routes/api/v1/repo/repo.go b/routes/api/v1/repo/repo.go index 8410dcca..c3fcb093 100644 --- a/routes/api/v1/repo/repo.go +++ b/routes/api/v1/repo/repo.go @@ -101,6 +101,12 @@ func listUserRepositories(c *context.APIContext, username string) { return } + if err = models.RepositoryList(ownRepos).LoadAttributes(); err != nil { + c.Error(500, "LoadAttributes(ownRepos)", err) + return + } + + // Early return for querying other user's repositories if c.User.ID != user.ID { repos := make([]*api.Repository, len(ownRepos)) for i := range ownRepos { diff --git a/templates/.VERSION b/templates/.VERSION index abc4523a..9076ba81 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.11.21.0611
\ No newline at end of file +0.11.22.0621
\ No newline at end of file |