Infrastructure/forgejo
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-12-22 15:23:14 -05:00
Code Issues Activity

Drop IDOrderDesc for listing Actions task and always order by id DESC (#31150)

Browse source 
Close #31066

Just follow what `FindRunOptions` and `FindScheduleOptions` do.

(cherry picked from commit 572fa55fbcc2cb9418b4f7b981a7c80a11899276)
This commit is contained in:
Jason Song 2024-05-31 10:30:02 +08:00 committed by Earl Warren
parent 18eef3b23a
commit 3e5f85ccf3
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
2 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
models/actions/task_list.go
View file

@ -54,7 +54,6 @@ type FindTaskOptions struct {
UpdatedBefore timeutil.TimeStamp UpdatedBefore timeutil.TimeStamp
StartedBefore timeutil.TimeStamp StartedBefore timeutil.TimeStamp
RunnerID int64 RunnerID int64
IDOrderDesc bool
} }
func (opts FindTaskOptions) ToConds() builder.Cond { func (opts FindTaskOptions) ToConds() builder.Cond {
@ -84,8 +83,5 @@ func (opts FindTaskOptions) ToConds() builder.Cond {
} }
func (opts FindTaskOptions) ToOrders() string { func (opts FindTaskOptions) ToOrders() string {
if opts.IDOrderDesc { return "`id` DESC"
return "`id` DESC"
}
return ""
} }

5
routers/web/shared/actions/runners.go
View file

@ -79,9 +79,8 @@ func RunnerDetails(ctx *context.Context, page int, runnerID, ownerID, repoID int
Page: page, Page: page,
PageSize: 30, PageSize: 30,
}, },
Status: actions_model.StatusUnknown, // Unknown means all Status: actions_model.StatusUnknown, // Unknown means all
IDOrderDesc: true, RunnerID: runner.ID,
RunnerID: runner.ID,
} }
tasks, count, err := db.FindAndCount[actions_model.ActionTask](ctx, opts) tasks, count, err := db.FindAndCount[actions_model.ActionTask](ctx, opts)