tyler.durden/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2025-04-08 17:05:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: omit total in FindTasks

Browse Source
This commit is contained in:
Jason Song 2023-01-04 16:16:31 +08:00
parent 5d938ebf4e
commit 7f6a803d24
No known key found for this signature in database
GPG Key ID: 8402EEEE4511A8B5
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
models/actions/task_list.go
View File

@ -88,7 +88,7 @@ func (opts FindTaskOptions) toConds() builder.Cond {
return cond
}
func FindTasks(ctx context.Context, opts FindTaskOptions) (TaskList, int64, error) {
func FindTasks(ctx context.Context, opts FindTaskOptions) (TaskList, error) {
e := db.GetEngine(ctx).Where(opts.toConds())
if opts.PageSize > 0 && opts.Page >= 1 {
e.Limit(opts.PageSize, (opts.Page-1)*opts.PageSize)
@ -97,8 +97,7 @@ func FindTasks(ctx context.Context, opts FindTaskOptions) (TaskList, int64, erro
e.OrderBy("id DESC")
}
var tasks TaskList
total, err := e.FindAndCount(&tasks)
return tasks, total, err
return tasks, e.Find(&tasks)
}
func CountTasks(ctx context.Context, opts FindTaskOptions) (int64, error) {

2
routers/web/shared/actions/runners.go
View File

@ -98,7 +98,7 @@ func RunnerDetails(ctx *context.Context, tplName base.TplName, page int, runnerI
return
}
tasks, _, err := actions_model.FindTasks(ctx, opts)
tasks, err := actions_model.FindTasks(ctx, opts)
if err != nil {
ctx.ServerError("FindTasks", err)
return

2
services/actions/actions.go
View File

@ -34,7 +34,7 @@ func Init() {
}
func DeleteResourceOfRepository(ctx context.Context, repo *repo_model.Repository) error {
tasks, _, err := actions_model.FindTasks(ctx, actions_model.FindTaskOptions{RepoID: repo.ID})
tasks, err := actions_model.FindTasks(ctx, actions_model.FindTaskOptions{RepoID: repo.ID})
if err != nil {
return fmt.Errorf("find task of repo %v: %w", repo.ID, err)
}

2
services/actions/clear_tasks.go
View File

@ -38,7 +38,7 @@ func StopEndlessTasks(ctx context.Context) error {
}
func stopTasks(ctx context.Context, opts actions_model.FindTaskOptions) error {
tasks, _, err := actions_model.FindTasks(ctx, opts)
tasks, err := actions_model.FindTasks(ctx, opts)
if err != nil {
return fmt.Errorf("find tasks: %w", err)
}