diff options
Diffstat (limited to 'routers')
| -rw-r--r-- | routers/org/setting.go | 9 | ||||
| -rw-r--r-- | routers/repo/webhook.go | 13 |
2 files changed, 12 insertions, 10 deletions
diff --git a/routers/org/setting.go b/routers/org/setting.go index 1cd9fc16..4949c3a0 100644 --- a/routers/org/setting.go +++ b/routers/org/setting.go @@ -18,9 +18,9 @@ import ( ) const ( - SETTINGS_OPTIONS base.TplName = "org/settings/options" - SETTINGS_DELETE base.TplName = "org/settings/delete" - SETTINGS_HOOKS base.TplName = "org/settings/hooks" + SETTINGS_OPTIONS base.TplName = "org/settings/options" + SETTINGS_DELETE base.TplName = "org/settings/delete" + SETTINGS_WEBHOOKS base.TplName = "org/settings/webhooks" ) func Settings(ctx *context.Context) { @@ -140,6 +140,7 @@ func Webhooks(ctx *context.Context) { ctx.Data["PageIsSettingsHooks"] = true ctx.Data["BaseLink"] = ctx.Org.OrgLink ctx.Data["Description"] = ctx.Tr("org.settings.hooks_desc") + ctx.Data["Types"] = setting.Webhook.Types ws, err := models.GetWebhooksByOrgID(ctx.Org.Organization.ID) if err != nil { @@ -148,7 +149,7 @@ func Webhooks(ctx *context.Context) { } ctx.Data["Webhooks"] = ws - ctx.HTML(200, SETTINGS_HOOKS) + ctx.HTML(200, SETTINGS_WEBHOOKS) } func DeleteWebhook(ctx *context.Context) { 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 } |