* Fix #3189 #3445: Order labels by name * Order labels by name on Issues view
This commit is contained in:
parent
f8a48ffaad
commit
f50e568fd1
|
@ -103,13 +103,13 @@ func GetLabelInRepoByID(repoID, labelID int64) (*Label, error) {
|
||||||
// it silently ignores label IDs that are not belong to the repository.
|
// it silently ignores label IDs that are not belong to the repository.
|
||||||
func GetLabelsInRepoByIDs(repoID int64, labelIDs []int64) ([]*Label, error) {
|
func GetLabelsInRepoByIDs(repoID int64, labelIDs []int64) ([]*Label, error) {
|
||||||
labels := make([]*Label, 0, len(labelIDs))
|
labels := make([]*Label, 0, len(labelIDs))
|
||||||
return labels, x.Where("repo_id = ?", repoID).In("id", base.Int64sToStrings(labelIDs)).Find(&labels)
|
return labels, x.Where("repo_id = ?", repoID).In("id", base.Int64sToStrings(labelIDs)).Asc("name").Find(&labels)
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetLabelsByRepoID returns all labels that belong to given repository by ID.
|
// GetLabelsByRepoID returns all labels that belong to given repository by ID.
|
||||||
func GetLabelsByRepoID(repoID int64) ([]*Label, error) {
|
func GetLabelsByRepoID(repoID int64) ([]*Label, error) {
|
||||||
labels := make([]*Label, 0, 10)
|
labels := make([]*Label, 0, 10)
|
||||||
return labels, x.Where("repo_id = ?", repoID).Find(&labels)
|
return labels, x.Where("repo_id = ?", repoID).Asc("name").Find(&labels)
|
||||||
}
|
}
|
||||||
|
|
||||||
func getLabelsByIssueID(e Engine, issueID int64) ([]*Label, error) {
|
func getLabelsByIssueID(e Engine, issueID int64) ([]*Label, error) {
|
||||||
|
@ -126,7 +126,7 @@ func getLabelsByIssueID(e Engine, issueID int64) ([]*Label, error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
labels := make([]*Label, 0, len(labelIDs))
|
labels := make([]*Label, 0, len(labelIDs))
|
||||||
return labels, e.Where("id > 0").In("id", base.Int64sToStrings(labelIDs)).Find(&labels)
|
return labels, e.Where("id > 0").In("id", base.Int64sToStrings(labelIDs)).Asc("name").Find(&labels)
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetLabelsByIssueID returns all labels that belong to given issue by ID.
|
// GetLabelsByIssueID returns all labels that belong to given issue by ID.
|
||||||
|
|
Loading…
Reference in New Issue