diff options
| author | crohr <cyril.rohr@gmail.com> | 2015-07-14 15:09:08 +0000 |
|---|---|---|
| committer | crohr <cyril.rohr@gmail.com> | 2015-07-14 15:09:08 +0000 |
| commit | cbce2ec9cf74a96b15bbd1a5463957921465a980 (patch) | |
| tree | 48f08facd06aa9910c98cdcada1a73d8d308775c /routers/repo/setting.go | |
| parent | b8e9c600409683b0f5eb10b637de003ce23b7796 (diff) | |
| parent | ec774d48c58f83b599ac210d6def718187806ecd (diff) | |
Merge remote-tracking branch 'origin/master' into pkgr
Diffstat (limited to 'routers/repo/setting.go')
| -rw-r--r-- | routers/repo/setting.go | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/routers/repo/setting.go b/routers/repo/setting.go index cdcade67..756f2979 100644 --- a/routers/repo/setting.go +++ b/routers/repo/setting.go @@ -282,6 +282,7 @@ func WebHooksNew(ctx *middleware.Context) { ctx.Data["PageIsSettingsHooksNew"] = true ctx.Data["Webhook"] = models.Webhook{HookEvent: &models.HookEvent{}} renderHookTypes(ctx) + orCtx, err := getOrgRepoCtx(ctx) if err != nil { ctx.Handle(500, "WebHooksNew(getOrgRepoCtx)", err) @@ -296,6 +297,7 @@ func WebHooksNewPost(ctx *middleware.Context, form auth.NewWebhookForm) { ctx.Data["PageIsSettingsHooks"] = true ctx.Data["PageIsSettingsHooksNew"] = true ctx.Data["Webhook"] = models.Webhook{HookEvent: &models.HookEvent{}} + renderHookTypes(ctx) orCtx, err := getOrgRepoCtx(ctx) if err != nil { @@ -364,14 +366,10 @@ func WebHooksEdit(ctx *middleware.Context) { // set data per HookTaskType switch w.HookTaskType { case models.SLACK: - { - ctx.Data["SlackHook"] = w.GetSlackHook() - ctx.Data["HookType"] = "Slack" - } + ctx.Data["SlackHook"] = w.GetSlackHook() + ctx.Data["HookType"] = "Slack" default: - { - ctx.Data["HookType"] = "Gogs" - } + ctx.Data["HookType"] = "Gogs" } w.GetEvent() ctx.Data["Webhook"] = w @@ -403,6 +401,15 @@ func WebHooksEditPost(ctx *middleware.Context, form auth.NewWebhookForm) { } return } + + // set data per HookTaskType + switch w.HookTaskType { + case models.SLACK: + ctx.Data["SlackHook"] = w.GetSlackHook() + ctx.Data["HookType"] = "Slack" + default: + ctx.Data["HookType"] = "Gogs" + } w.GetEvent() ctx.Data["Webhook"] = w |