core
/
gitea
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix panic in team repos API (#19431) 

* Fix panic in team repos API

* Fix pagination

* fmt
This commit is contained in:
qwerty287 2022-04-20 12:43:26 +02:00 committed by GitHub
parent 409ff55a29
commit ae6a52440a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
models/organization/team_repo.go
View File

@ -48,7 +48,7 @@ func GetTeamRepositories(ctx context.Context, opts *SearchTeamRepoOptions) ([]*r
) )
} }
if opts.PageSize > 0 { if opts.PageSize > 0 {
sess.Limit(opts.PageSize, opts.Page*opts.PageSize) sess.Limit(opts.PageSize, (opts.Page-1)*opts.PageSize)
} }
var repos []*repo_model.Repository var repos []*repo_model.Repository
return repos, sess.OrderBy("repository.name"). return repos, sess.OrderBy("repository.name").

2
routers/api/v1/org/team.go
View File

@ -545,7 +545,7 @@ func GetTeamRepos(ctx *context.APIContext) {
ctx.Error(http.StatusInternalServerError, "GetTeamRepos", err) ctx.Error(http.StatusInternalServerError, "GetTeamRepos", err)
return return
} }
repos := make([]*api.Repository, len(team.Repos)) repos := make([]*api.Repository, len(teamRepos))
for i, repo := range teamRepos { for i, repo := range teamRepos {
access, err := models.AccessLevel(ctx.Doer, repo) access, err := models.AccessLevel(ctx.Doer, repo)
if err != nil { if err != nil {

1
routers/web/misc/markdown.go
View File

@ -16,6 +16,7 @@ import (
api "code.gitea.io/gitea/modules/structs" api "code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/modules/util" "code.gitea.io/gitea/modules/util"
"code.gitea.io/gitea/modules/web" "code.gitea.io/gitea/modules/web"
"mvdan.cc/xurls/v2" "mvdan.cc/xurls/v2"
) )