From 60aca9ea18f4fed6c98c83d41036f9a34fdbd28c Mon Sep 17 00:00:00 2001 From: Unknwon Date: Tue, 21 Feb 2017 20:21:25 -0500 Subject: webhook: also only enable certain types (#3356) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add new config option '[webhook] TYPES’. --- routers/repo/webhook.go | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'routers/repo/webhook.go') diff --git a/routers/repo/webhook.go b/routers/repo/webhook.go index 542fa635..07b9432b 100644 --- a/routers/repo/webhook.go +++ b/routers/repo/webhook.go @@ -23,9 +23,9 @@ import ( ) const ( - HOOKS base.TplName = "repo/settings/hooks" - HOOK_NEW base.TplName = "repo/settings/hook_new" - ORG_HOOK_NEW base.TplName = "org/settings/hook_new" + WEBHOOKS base.TplName = "repo/settings/webhooks" + WEBHOOK_NEW base.TplName = "repo/settings/webhook_new" + ORG_WEBHOOK_NEW base.TplName = "org/settings/webhook_new" ) func Webhooks(ctx *context.Context) { @@ -33,6 +33,7 @@ func Webhooks(ctx *context.Context) { ctx.Data["PageIsSettingsHooks"] = true ctx.Data["BaseLink"] = ctx.Repo.RepoLink ctx.Data["Description"] = ctx.Tr("repo.settings.hooks_desc", "https://github.com/gogits/go-gogs-client/wiki/Repositories-Webhooks") + ctx.Data["Types"] = setting.Webhook.Types ws, err := models.GetWebhooksByRepoID(ctx.Repo.Repository.ID) if err != nil { @@ -41,7 +42,7 @@ func Webhooks(ctx *context.Context) { } ctx.Data["Webhooks"] = ws - ctx.HTML(200, HOOKS) + ctx.HTML(200, WEBHOOKS) } type OrgRepoCtx struct { @@ -57,7 +58,7 @@ func getOrgRepoCtx(ctx *context.Context) (*OrgRepoCtx, error) { return &OrgRepoCtx{ RepoID: ctx.Repo.Repository.ID, Link: ctx.Repo.RepoLink, - NewTemplate: HOOK_NEW, + NewTemplate: WEBHOOK_NEW, }, nil } @@ -65,7 +66,7 @@ func getOrgRepoCtx(ctx *context.Context) (*OrgRepoCtx, error) { return &OrgRepoCtx{ OrgID: ctx.Org.Organization.ID, Link: ctx.Org.OrgLink, - NewTemplate: ORG_HOOK_NEW, + NewTemplate: ORG_WEBHOOK_NEW, }, nil } -- cgit v1.2.3