Merge pull request #10165 from ywk253100/191205_sort_1.10

Sort the tag before returning the list when calling API
This commit is contained in:
Wang Yan 2019-12-06 11:37:51 +08:00 committed by GitHub
commit 2e2c849aa6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -615,21 +615,24 @@ func (ra *RepositoryAPI) GetTags() {
} }
tags = ts tags = ts
} }
result := []*models.TagResp{}
detail, err := ra.GetBool("detail", true) detail, err := ra.GetBool("detail", true)
if !detail && err == nil { if !detail && err == nil {
ra.Data["json"] = simpleTags(tags) result = simpleTags(tags)
ra.ServeJSON() } else {
return result = assembleTagsInParallel(
client,
project.ProjectID,
repoName,
tags,
ra.SecurityCtx.GetUsername(),
)
} }
// sort by tag name
ra.Data["json"] = assembleTagsInParallel( sort.Slice(result, func(i, j int) bool {
client, return result[i].Name < result[j].Name
project.ProjectID, })
repoName, ra.Data["json"] = result
tags,
ra.SecurityCtx.GetUsername(),
)
ra.ServeJSON() ra.ServeJSON()
} }