diff options
| author | wxiaoguang <wxiaoguang@gmail.com> | 2023-04-12 22:05:10 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-12 16:05:10 +0200 |
| commit | d562b419b6e13ca5e1b601f0e967b00d6826c3de (patch) | |
| tree | 743157e51dd4b24f4a6747e93f4b057fccd84b9f /routers | |
| parent | 5482602ba8fc84f716e4742467bc429037f45f88 (diff) | |
| download | gitea-d562b419b6e13ca5e1b601f0e967b00d6826c3de.tar.gz gitea-d562b419b6e13ca5e1b601f0e967b00d6826c3de.zip | |
Make label templates have consistent behavior and priority (#23749) (#24071)
Backport #23749
Fix https://github.com/go-gitea/gitea/issues/23715
Backported manually and tested manually.
Diffstat (limited to 'routers')
| -rw-r--r-- | routers/web/org/setting.go | 2 | ||||
| -rw-r--r-- | routers/web/repo/issue_label.go | 2 | ||||
| -rw-r--r-- | routers/web/repo/issue_label_test.go | 2 | ||||
| -rw-r--r-- | routers/web/repo/repo.go | 4 |
4 files changed, 6 insertions, 4 deletions
diff --git a/routers/web/org/setting.go b/routers/web/org/setting.go index 5c9b7967c3..0363c228c9 100644 --- a/routers/web/org/setting.go +++ b/routers/web/org/setting.go @@ -247,6 +247,6 @@ func Labels(ctx *context.Context) { ctx.Data["PageIsOrgSettings"] = true ctx.Data["PageIsOrgSettingsLabels"] = true ctx.Data["RequireTribute"] = true - ctx.Data["LabelTemplates"] = repo_module.LabelTemplates + ctx.Data["LabelTemplateFiles"] = repo_module.LabelTemplateFiles ctx.HTML(http.StatusOK, tplSettingsLabels) } diff --git a/routers/web/repo/issue_label.go b/routers/web/repo/issue_label.go index 31bf85fedb..a4ea53d13d 100644 --- a/routers/web/repo/issue_label.go +++ b/routers/web/repo/issue_label.go @@ -29,7 +29,7 @@ func Labels(ctx *context.Context) { ctx.Data["PageIsIssueList"] = true ctx.Data["PageIsLabels"] = true ctx.Data["RequireTribute"] = true - ctx.Data["LabelTemplates"] = repo_module.LabelTemplates + ctx.Data["LabelTemplateFiles"] = repo_module.LabelTemplateFiles ctx.HTML(http.StatusOK, tplLabels) } diff --git a/routers/web/repo/issue_label_test.go b/routers/web/repo/issue_label_test.go index a62d2afaa8..c24fe898b6 100644 --- a/routers/web/repo/issue_label_test.go +++ b/routers/web/repo/issue_label_test.go @@ -10,6 +10,7 @@ import ( issues_model "code.gitea.io/gitea/models/issues" "code.gitea.io/gitea/models/unittest" + "code.gitea.io/gitea/modules/repository" "code.gitea.io/gitea/modules/test" "code.gitea.io/gitea/modules/web" "code.gitea.io/gitea/services/forms" @@ -30,6 +31,7 @@ func int64SliceToCommaSeparated(a []int64) string { func TestInitializeLabels(t *testing.T) { unittest.PrepareTestEnv(t) + assert.NoError(t, repository.LoadRepoConfig()) ctx := test.MockContext(t, "user2/repo1/labels/initialize") test.LoadUser(t, ctx, 2) test.LoadRepo(t, ctx, 2) diff --git a/routers/web/repo/repo.go b/routers/web/repo/repo.go index 9f2add1fe6..30c2500200 100644 --- a/routers/web/repo/repo.go +++ b/routers/web/repo/repo.go @@ -132,7 +132,7 @@ func Create(ctx *context.Context) { // Give default value for template to render. ctx.Data["Gitignores"] = repo_module.Gitignores - ctx.Data["LabelTemplates"] = repo_module.LabelTemplates + ctx.Data["LabelTemplateFiles"] = repo_module.LabelTemplateFiles ctx.Data["Licenses"] = repo_module.Licenses ctx.Data["Readmes"] = repo_module.Readmes ctx.Data["readme"] = "Default" @@ -200,7 +200,7 @@ func CreatePost(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("new_repo") ctx.Data["Gitignores"] = repo_module.Gitignores - ctx.Data["LabelTemplates"] = repo_module.LabelTemplates + ctx.Data["LabelTemplateFiles"] = repo_module.LabelTemplateFiles ctx.Data["Licenses"] = repo_module.Licenses ctx.Data["Readmes"] = repo_module.Readmes |