Change general form binding to gogs form (#8334)

diff --git a/routers/repo/webhook.go b/routers/repo/webhook.go
index 0711270cb9fd741627c72e514f71a6217ffff987..48b4e7afff66ec6e07ea3250977d498acbc25504 100644 (file)
--- a/routers/repo/webhook.go
+++ b/routers/repo/webhook.go
@@ -198,20 +198,17 @@ func WebHooksNewPost(ctx *context.Context, form auth.NewWebhookForm) {
 }
 
 // GogsHooksNewPost response for creating webhook
-func GogsHooksNewPost(ctx *context.Context, form auth.NewWebhookForm) {
-       newGenericWebhookPost(ctx, form, models.GOGS)
+func GogsHooksNewPost(ctx *context.Context, form auth.NewGogshookForm) {
+       newGogsWebhookPost(ctx, form, models.GOGS)
 }
 
-func newGenericWebhookPost(ctx *context.Context, form auth.NewWebhookForm, kind models.HookTaskType) {
+// newGogsWebhookPost response for creating gogs hook
+func newGogsWebhookPost(ctx *context.Context, form auth.NewGogshookForm, kind models.HookTaskType) {
        ctx.Data["Title"] = ctx.Tr("repo.settings.add_webhook")
        ctx.Data["PageIsSettingsHooks"] = true
        ctx.Data["PageIsSettingsHooksNew"] = true
        ctx.Data["Webhook"] = models.Webhook{HookEvent: &models.HookEvent{}}
-
-       ctx.Data["HookType"] = "gitea"
-       if kind == models.GOGS {
-               ctx.Data["HookType"] = "gogs"
-       }
+       ctx.Data["HookType"] = "gogs"
 
        orCtx, err := getOrgRepoCtx(ctx)
        if err != nil {

diff --git a/routers/routes/routes.go b/routers/routes/routes.go
index 5262d4ad5cf7f9f0f49a650797c47b7d4a9e3f12..11f2029226a7af52030157cd9ed60ea0215852f1 100644 (file)
--- a/routers/routes/routes.go
+++ b/routers/routes/routes.go
@@ -444,7 +444,7 @@ func RegisterRoutes(m *macaron.Macaron) {
                        m.Post("/delete", admin.DeleteDefaultWebhook)
                        m.Get("/:type/new", repo.WebhooksNew)
                        m.Post("/gitea/new", bindIgnErr(auth.NewWebhookForm{}), repo.WebHooksNewPost)
-                       m.Post("/gogs/new", bindIgnErr(auth.NewWebhookForm{}), repo.GogsHooksNewPost)
+                       m.Post("/gogs/new", bindIgnErr(auth.NewGogshookForm{}), repo.GogsHooksNewPost)
                        m.Post("/slack/new", bindIgnErr(auth.NewSlackHookForm{}), repo.SlackHooksNewPost)
                        m.Post("/discord/new", bindIgnErr(auth.NewDiscordHookForm{}), repo.DiscordHooksNewPost)
                        m.Post("/dingtalk/new", bindIgnErr(auth.NewDingtalkHookForm{}), repo.DingtalkHooksNewPost)
@@ -452,7 +452,7 @@ func RegisterRoutes(m *macaron.Macaron) {
                        m.Post("/msteams/new", bindIgnErr(auth.NewMSTeamsHookForm{}), repo.MSTeamsHooksNewPost)
                        m.Get("/:id", repo.WebHooksEdit)
                        m.Post("/gitea/:id", bindIgnErr(auth.NewWebhookForm{}), repo.WebHooksEditPost)
-                       m.Post("/gogs/:id", bindIgnErr(auth.NewWebhookForm{}), repo.GogsHooksEditPost)
+                       m.Post("/gogs/:id", bindIgnErr(auth.NewGogshookForm{}), repo.GogsHooksEditPost)
                        m.Post("/slack/:id", bindIgnErr(auth.NewSlackHookForm{}), repo.SlackHooksEditPost)
                        m.Post("/discord/:id", bindIgnErr(auth.NewDiscordHookForm{}), repo.DiscordHooksEditPost)
                        m.Post("/dingtalk/:id", bindIgnErr(auth.NewDingtalkHookForm{}), repo.DingtalkHooksEditPost)
@@ -585,7 +585,7 @@ func RegisterRoutes(m *macaron.Macaron) {
                                        m.Post("/delete", org.DeleteWebhook)
                                        m.Get("/:type/new", repo.WebhooksNew)
                                        m.Post("/gitea/new", bindIgnErr(auth.NewWebhookForm{}), repo.WebHooksNewPost)
-                                       m.Post("/gogs/new", bindIgnErr(auth.NewWebhookForm{}), repo.GogsHooksNewPost)
+                                       m.Post("/gogs/new", bindIgnErr(auth.NewGogshookForm{}), repo.GogsHooksNewPost)
                                        m.Post("/slack/new", bindIgnErr(auth.NewSlackHookForm{}), repo.SlackHooksNewPost)
                                        m.Post("/discord/new", bindIgnErr(auth.NewDiscordHookForm{}), repo.DiscordHooksNewPost)
                                        m.Post("/dingtalk/new", bindIgnErr(auth.NewDingtalkHookForm{}), repo.DingtalkHooksNewPost)
@@ -647,7 +647,7 @@ func RegisterRoutes(m *macaron.Macaron) {
                                m.Post("/delete", repo.DeleteWebhook)
                                m.Get("/:type/new", repo.WebhooksNew)
                                m.Post("/gitea/new", bindIgnErr(auth.NewWebhookForm{}), repo.WebHooksNewPost)
-                               m.Post("/gogs/new", bindIgnErr(auth.NewWebhookForm{}), repo.GogsHooksNewPost)
+                               m.Post("/gogs/new", bindIgnErr(auth.NewGogshookForm{}), repo.GogsHooksNewPost)
                                m.Post("/slack/new", bindIgnErr(auth.NewSlackHookForm{}), repo.SlackHooksNewPost)
                                m.Post("/discord/new", bindIgnErr(auth.NewDiscordHookForm{}), repo.DiscordHooksNewPost)
                                m.Post("/dingtalk/new", bindIgnErr(auth.NewDingtalkHookForm{}), repo.DingtalkHooksNewPost)