This commit is contained in:
@@ -6,11 +6,11 @@ package issue
|
||||
import (
|
||||
"strings"
|
||||
|
||||
"code.gitea.io/gitea/models/db"
|
||||
issues_model "code.gitea.io/gitea/models/issues"
|
||||
user_model "code.gitea.io/gitea/models/user"
|
||||
"code.gitea.io/gitea/modules/base"
|
||||
"code.gitea.io/gitea/services/context"
|
||||
"gitea.dev/models/db"
|
||||
issues_model "gitea.dev/models/issues"
|
||||
user_model "gitea.dev/models/user"
|
||||
"gitea.dev/modules/base"
|
||||
"gitea.dev/services/context"
|
||||
)
|
||||
|
||||
// PrepareFilterIssueLabels reads the "labels" query parameter, sets `ctx.Data["Labels"]` and `ctx.Data["SelectLabels"]`
|
||||
@@ -38,6 +38,7 @@ func PrepareFilterIssueLabels(ctx *context.Context, repoID int64, owner *user_mo
|
||||
ctx.ServerError("GetLabelsByRepoID", err)
|
||||
return ret
|
||||
}
|
||||
issues_model.SortLabelsForDisplay(repoLabels)
|
||||
allLabels = append(allLabels, repoLabels...)
|
||||
}
|
||||
|
||||
@@ -47,6 +48,7 @@ func PrepareFilterIssueLabels(ctx *context.Context, repoID int64, owner *user_mo
|
||||
ctx.ServerError("GetLabelsByOrgID", err)
|
||||
return ret
|
||||
}
|
||||
issues_model.SortLabelsForDisplay(orgLabels)
|
||||
allLabels = append(allLabels, orgLabels...)
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user