Fix deleting admin webhooks and rename method

models/webhook.go

@@ -412,16 +412,16 @@ func DeleteWebhookByOrgID(orgID, id int64) error {
  })
 }
 
-// DeleteDefaultWebhook deletes an admin-default webhook by given ID.
-func DeleteDefaultWebhook(id int64) error {
+// DeleteDefaultSystemWebhook deletes an admin-configured default or system webhook (where Org and Repo ID both 0)
+func DeleteDefaultSystemWebhook(id int64) error {
  sess := x.NewSession()
  defer sess.Close()
  if err := sess.Begin(); err != nil {
  return err
  }
 
  count, err := sess.
- Where("repo_id=? AND org_id=? AND is_system_webhook=?", 0, 0, false).
+ Where("repo_id=? AND org_id=?", 0, 0).
  Delete(&Webhook{ID: id})
  if err != nil {
  return err

routers/admin/hooks.go

@@ -16,8 +16,8 @@ const (
  tplAdminHooks base.TplName = "admin/hooks"
 )
 
-// DefaultAndSystemWebhooks renders both admin default and system webhook list pages
-func DefaultAndSystemWebhooks(ctx *context.Context) {
+// DefaultOrSystemWebhooks renders both admin default and system webhook list pages
+func DefaultOrSystemWebhooks(ctx *context.Context) {
  var ws []*models.Webhook
  var err error
 
@@ -45,15 +45,22 @@ func DefaultAndSystemWebhooks(ctx *context.Context) {
  ctx.HTML(200, tplAdminHooks)
 }
 
-// DeleteDefaultWebhook response for delete admin-default webhook
-func DeleteDefaultWebhook(ctx *context.Context) {
- if err := models.DeleteDefaultWebhook(ctx.QueryInt64("id")); err != nil {
+// DeleteDefaultOrSystemWebhook handler to delete an admin-defined system or default webhook
+func DeleteDefaultOrSystemWebhook(ctx *context.Context) {
+ if err := models.DeleteDefaultSystemWebhook(ctx.QueryInt64("id")); err != nil {
  ctx.Flash.Error("DeleteDefaultWebhook: " + err.Error())
  } else {
  ctx.Flash.Success(ctx.Tr("repo.settings.webhook_deletion_success"))
  }
 
- ctx.JSON(200, map[string]interface{}{
- "redirect": setting.AppSubURL + "/admin/hooks",
- })
+ // Are we looking at default webhooks?
+ if ctx.Params(":configType") == "hooks" {
+ ctx.JSON(200, map[string]interface{}{
+ "redirect": setting.AppSubURL + "/admin/hooks",
+ })
+ } else {
+ ctx.JSON(200, map[string]interface{}{
+ "redirect": setting.AppSubURL + "/admin/system-hooks",
+ })
+ }
 }

routers/routes/routes.go

@@ -454,8 +454,8 @@ func RegisterRoutes(m *macaron.Macaron) {
  })
 
  m.Group("/^:configType(hooks|system-hooks)$", func() {
- m.Get("", admin.DefaultAndSystemWebhooks)
- m.Post("/delete", admin.DeleteDefaultWebhook)
+ m.Get("", admin.DefaultOrSystemWebhooks)
+ m.Post("/delete", admin.DeleteDefaultOrSystemWebhook)
  m.Get("/:type/new", repo.WebhooksNew)
  m.Post("/gitea/new", bindIgnErr(auth.NewWebhookForm{}), repo.WebHooksNewPost)
  m.Post("/gogs/new", bindIgnErr(auth.NewGogshookForm{}), repo.GogsHooksNewPost)