mirror of
https://github.com/go-gitea/gitea.git
synced 2026-05-22 08:33:07 +02:00
Sort action run jobs by JobID then Name using natural sort
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
parent
9bb0aa1c49
commit
9b828298e7
@ -12,6 +12,7 @@ import (
|
|||||||
"code.gitea.io/gitea/models/db"
|
"code.gitea.io/gitea/models/db"
|
||||||
repo_model "code.gitea.io/gitea/models/repo"
|
repo_model "code.gitea.io/gitea/models/repo"
|
||||||
"code.gitea.io/gitea/modules/actions/jobparser"
|
"code.gitea.io/gitea/modules/actions/jobparser"
|
||||||
|
"code.gitea.io/gitea/modules/base"
|
||||||
"code.gitea.io/gitea/modules/timeutil"
|
"code.gitea.io/gitea/modules/timeutil"
|
||||||
"code.gitea.io/gitea/modules/util"
|
"code.gitea.io/gitea/modules/util"
|
||||||
|
|
||||||
@ -152,6 +153,12 @@ func GetRunJobsByRunID(ctx context.Context, runID int64) (ActionJobList, error)
|
|||||||
if err := db.GetEngine(ctx).Where("run_id=?", runID).OrderBy("id").Find(&jobs); err != nil {
|
if err := db.GetEngine(ctx).Where("run_id=?", runID).OrderBy("id").Find(&jobs); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
slices.SortStableFunc(jobs, func(a, b *ActionRunJob) int {
|
||||||
|
if cmp := base.NaturalSortCompare(a.JobID, b.JobID); cmp != 0 {
|
||||||
|
return cmp
|
||||||
|
}
|
||||||
|
return base.NaturalSortCompare(a.Name, b.Name)
|
||||||
|
})
|
||||||
return jobs, nil
|
return jobs, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user