mirror/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-28 12:16:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Use context for RepositoryList.LoadAttributes (#23435)

Browse source
This commit is contained in:
yp05327 2023-03-13 20:31:41 +09:00 committed by GitHub
parent cdc9e91750
commit d74a7efb60
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
models/repo/repo_list.go
View file

@ -62,7 +62,8 @@ func RepositoryListOfMap(repoMap map[int64]*Repository) RepositoryList {
return RepositoryList(ValuesRepository(repoMap)) return RepositoryList(ValuesRepository(repoMap))
} }
func (repos RepositoryList) loadAttributes(ctx context.Context) error { // LoadAttributes loads the attributes for the given RepositoryList
func (repos RepositoryList) LoadAttributes(ctx context.Context) error {
if len(repos) == 0 { if len(repos) == 0 {
return nil return nil
} }
@ -107,11 +108,6 @@ func (repos RepositoryList) loadAttributes(ctx context.Context) error {
return nil return nil
} }
// LoadAttributes loads the attributes for the given RepositoryList
func (repos RepositoryList) LoadAttributes() error {
return repos.loadAttributes(db.DefaultContext)
}
// SearchRepoOptions holds the search options // SearchRepoOptions holds the search options
type SearchRepoOptions struct { type SearchRepoOptions struct {
db.ListOptions db.ListOptions
@ -547,7 +543,7 @@ func SearchRepositoryByCondition(ctx context.Context, opts *SearchRepoOptions, c
} }
if loadAttributes { if loadAttributes {
if err := repos.loadAttributes(ctx); err != nil { if err := repos.LoadAttributes(ctx); err != nil {
return nil, 0, fmt.Errorf("LoadAttributes: %w", err) return nil, 0, fmt.Errorf("LoadAttributes: %w", err)
} }
} }

2
routers/api/v1/user/repo.go
View file

@ -31,7 +31,7 @@ func listUserRepos(ctx *context.APIContext, u *user_model.User, private bool) {
return return
} }
if err := repos.LoadAttributes(); err != nil { if err := repos.LoadAttributes(ctx); err != nil {
ctx.Error(http.StatusInternalServerError, "RepositoryList.LoadAttributes", err) ctx.Error(http.StatusInternalServerError, "RepositoryList.LoadAttributes", err)
return return
} }

2
routers/web/user/notification.go
View file

@ -117,7 +117,7 @@ func getNotifications(ctx *context.Context) {
return return
} }
notifications = notifications.Without(failures) notifications = notifications.Without(failures)
if err := repos.LoadAttributes(); err != nil { // TODO if err := repos.LoadAttributes(ctx); err != nil {
ctx.ServerError("LoadAttributes", err) ctx.ServerError("LoadAttributes", err)
return return
} }