Use GetListOptions() and panic()

This commit is contained in:
chesterip 2024-04-18 22:19:35 -04:00
parent ae25e049e4
commit 34777376d6
2 changed files with 3 additions and 13 deletions

View File

@ -9,6 +9,7 @@ import (
actions_model "code.gitea.io/gitea/models/actions"
"code.gitea.io/gitea/models/db"
api "code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/routers/api/v1/utils"
"code.gitea.io/gitea/services/context"
"code.gitea.io/gitea/services/convert"
)
@ -52,18 +53,7 @@ func ListActionTasks(ctx *context.APIContext) {
// "$ref": "#/responses/error"
// "422":
// "$ref": "#/responses/validationError"
page := ctx.FormInt("page")
limit := convert.ToCorrectPageSize(ctx.FormInt("limit"))
opts := actions_model.FindTaskOptions{
RepoID: ctx.Repo.Repository.ID,
ListOptions: db.ListOptions{
Page: page,
PageSize: limit,
},
Status: actions_model.StatusUnknown, // Unknown means all
IDOrderDesc: true,
}
opts := utils.GetListOptions(ctx)
tasks, total, err := db.FindAndCount[actions_model.ActionTask](ctx, opts)
if err != nil {

View File

@ -183,7 +183,7 @@ func ToTag(repo *repo_model.Repository, t *git.Tag) *api.Tag {
// ToActionTask convert a actions_model.ActionTask to an api.ActionTask
func ToActionTask(ctx context.Context, repo *repo_model.Repository, t *actions_model.ActionTask) *api.ActionTask {
if err := t.LoadAttributes(ctx); err != nil {
log.Warn("LoadAttributes of ActionTask: %v", err)
panic(fmt.Sprintf("failed to execute ActionTask.LoadAttributes(): %v", err))
}
return &api.ActionTask{