tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-07-08 19:47:21 +00:00
Code Releases Activity

Fix broken migration on webhook (#13911)

Browse Source 
* Fix broken migration on webhook

* Fix lint

Co-authored-by: John Olheiser <john.olheiser@gmail.com>
This commit is contained in:
Lunny Xiao
2020-12-10 01:20:13 +08:00
committed by GitHub
parent 18e4477ad4
commit 6edfa6bc88
8 changed files with 98 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
routers/api/v1/utils/hook.go
View File

@ -132,10 +132,10 @@ func addHook(ctx *context.APIContext, form *api.CreateHookOption, orgID, repoID
},
BranchFilter: form.BranchFilter,
},
IsActive: form.Active,
HookTaskType: models.HookTaskType(form.Type),
IsActive: form.Active,
Type: models.HookTaskType(form.Type),
}
if w.HookTaskType == models.SLACK {
if w.Type == models.SLACK {
channel, ok := form.Config["channel"]
if !ok {
ctx.Error(http.StatusUnprocessableEntity, "", "Missing config option: channel")
@ -219,7 +219,7 @@ func editHook(ctx *context.APIContext, form *api.EditHookOption, w *models.Webho
w.ContentType = models.ToHookContentType(ct)
}
if w.HookTaskType == models.SLACK {
if w.Type == models.SLACK {
if channel, ok := form.Config["channel"]; ok {
meta, err := json.Marshal(&webhook.SlackMeta{
Channel: channel,