From a1b74c55092b846f08a3432b313abcc4994b7259 Mon Sep 17 00:00:00 2001 From: zeripath Date: Sat, 13 Feb 2021 18:34:47 +0000 Subject: [PATCH] Allow org labels to be set with issue templates (#14593) (#14647) Backport #14593 Fix #13688 Signed-off-by: Andrew Thornton Co-authored-by: Lunny Xiao --- routers/repo/issue.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/routers/repo/issue.go b/routers/repo/issue.go index c24f7520de..e1868601c4 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -725,6 +725,14 @@ func setTemplateIfExists(ctx *context.Context, ctxDataKey string, possibleDirs [ ctx.Data[ctxDataKey] = templateBody labelIDs := make([]string, 0, len(meta.Labels)) if repoLabels, err := models.GetLabelsByRepoID(ctx.Repo.Repository.ID, "", models.ListOptions{}); err == nil { + ctx.Data["Labels"] = repoLabels + if ctx.Repo.Owner.IsOrganization() { + if orgLabels, err := models.GetLabelsByOrgID(ctx.Repo.Owner.ID, ctx.Query("sort"), models.ListOptions{}); err == nil { + ctx.Data["OrgLabels"] = orgLabels + repoLabels = append(repoLabels, orgLabels...) + } + } + for _, metaLabel := range meta.Labels { for _, repoLabel := range repoLabels { if strings.EqualFold(repoLabel.Name, metaLabel) { @@ -734,7 +742,6 @@ func setTemplateIfExists(ctx *context.Context, ctxDataKey string, possibleDirs [ } } } - ctx.Data["Labels"] = repoLabels } ctx.Data["HasSelectedLabel"] = len(labelIDs) > 0 ctx.Data["label_ids"] = strings.Join(labelIDs, ",")