Merge pull request from ywk253100/191205_sort

Sort the tag before returning the list when calling API
This commit is contained in:
Wang Yan 2019-12-06 11:38:31 +08:00 committed by GitHub
commit 9e83b9f1fc
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
}
result := []*models.TagResp{}
detail, err := ra.GetBool("detail", true)
if !detail && err == nil {
ra.Data["json"] = simpleTags(tags)
ra.ServeJSON()
return
result = simpleTags(tags)
} else {
result = assembleTagsInParallel(
client,
project.ProjectID,
repoName,
tags,
ra.SecurityCtx.GetUsername(),
)
}
ra.Data["json"] = assembleTagsInParallel(
client,
project.ProjectID,
repoName,
tags,
ra.SecurityCtx.GetUsername(),
)
// sort by tag name
sort.Slice(result, func(i, j int) bool {
return result[i].Name < result[j].Name
})
ra.Data["json"] = result
ra.ServeJSON()
}