Skip to content

Commit c72a471

Browse files
authored
Fix webhook template when validation errors occur (#11421)
Signed-off-by: kolaente <[email protected]>
1 parent 57217ca commit c72a471

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

routers/repo/webhook.go

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ func GiteaHooksNewPost(ctx *context.Context, form auth.NewWebhookForm) {
180180
ctx.Data["PageIsSettingsHooks"] = true
181181
ctx.Data["PageIsSettingsHooksNew"] = true
182182
ctx.Data["Webhook"] = models.Webhook{HookEvent: &models.HookEvent{}}
183-
ctx.Data["HookType"] = "gitea"
183+
ctx.Data["HookType"] = models.GITEA.Name()
184184

185185
orCtx, err := getOrgRepoCtx(ctx)
186186
if err != nil {
@@ -234,7 +234,7 @@ func newGogsWebhookPost(ctx *context.Context, form auth.NewGogshookForm, kind mo
234234
ctx.Data["PageIsSettingsHooks"] = true
235235
ctx.Data["PageIsSettingsHooksNew"] = true
236236
ctx.Data["Webhook"] = models.Webhook{HookEvent: &models.HookEvent{}}
237-
ctx.Data["HookType"] = "gogs"
237+
ctx.Data["HookType"] = models.GOGS.Name()
238238

239239
orCtx, err := getOrgRepoCtx(ctx)
240240
if err != nil {
@@ -282,6 +282,7 @@ func DiscordHooksNewPost(ctx *context.Context, form auth.NewDiscordHookForm) {
282282
ctx.Data["PageIsSettingsHooks"] = true
283283
ctx.Data["PageIsSettingsHooksNew"] = true
284284
ctx.Data["Webhook"] = models.Webhook{HookEvent: &models.HookEvent{}}
285+
ctx.Data["HookType"] = models.DISCORD.Name()
285286

286287
orCtx, err := getOrgRepoCtx(ctx)
287288
if err != nil {
@@ -332,6 +333,7 @@ func DingtalkHooksNewPost(ctx *context.Context, form auth.NewDingtalkHookForm) {
332333
ctx.Data["PageIsSettingsHooks"] = true
333334
ctx.Data["PageIsSettingsHooksNew"] = true
334335
ctx.Data["Webhook"] = models.Webhook{HookEvent: &models.HookEvent{}}
336+
ctx.Data["HookType"] = models.DINGTALK.Name()
335337

336338
orCtx, err := getOrgRepoCtx(ctx)
337339
if err != nil {
@@ -373,6 +375,7 @@ func TelegramHooksNewPost(ctx *context.Context, form auth.NewTelegramHookForm) {
373375
ctx.Data["PageIsSettingsHooks"] = true
374376
ctx.Data["PageIsSettingsHooksNew"] = true
375377
ctx.Data["Webhook"] = models.Webhook{HookEvent: &models.HookEvent{}}
378+
ctx.Data["HookType"] = models.TELEGRAM.Name()
376379

377380
orCtx, err := getOrgRepoCtx(ctx)
378381
if err != nil {
@@ -423,6 +426,7 @@ func MatrixHooksNewPost(ctx *context.Context, form auth.NewMatrixHookForm) {
423426
ctx.Data["PageIsSettingsHooks"] = true
424427
ctx.Data["PageIsSettingsHooksNew"] = true
425428
ctx.Data["Webhook"] = models.Webhook{HookEvent: &models.HookEvent{}}
429+
ctx.Data["HookType"] = models.MATRIX.Name()
426430

427431
orCtx, err := getOrgRepoCtx(ctx)
428432
if err != nil {
@@ -475,6 +479,7 @@ func MSTeamsHooksNewPost(ctx *context.Context, form auth.NewMSTeamsHookForm) {
475479
ctx.Data["PageIsSettingsHooks"] = true
476480
ctx.Data["PageIsSettingsHooksNew"] = true
477481
ctx.Data["Webhook"] = models.Webhook{HookEvent: &models.HookEvent{}}
482+
ctx.Data["HookType"] = models.MSTEAMS.Name()
478483

479484
orCtx, err := getOrgRepoCtx(ctx)
480485
if err != nil {
@@ -516,6 +521,7 @@ func SlackHooksNewPost(ctx *context.Context, form auth.NewSlackHookForm) {
516521
ctx.Data["PageIsSettingsHooks"] = true
517522
ctx.Data["PageIsSettingsHooksNew"] = true
518523
ctx.Data["Webhook"] = models.Webhook{HookEvent: &models.HookEvent{}}
524+
ctx.Data["HookType"] = models.SLACK.Name()
519525

520526
orCtx, err := getOrgRepoCtx(ctx)
521527
if err != nil {
@@ -574,6 +580,7 @@ func FeishuHooksNewPost(ctx *context.Context, form auth.NewFeishuHookForm) {
574580
ctx.Data["PageIsSettingsHooks"] = true
575581
ctx.Data["PageIsSettingsHooksNew"] = true
576582
ctx.Data["Webhook"] = models.Webhook{HookEvent: &models.HookEvent{}}
583+
ctx.Data["HookType"] = models.FEISHU.Name()
577584

578585
orCtx, err := getOrgRepoCtx(ctx)
579586
if err != nil {

templates/repo/settings/webhook/matrix.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
{{.CsrfTokenHtml}}
55
<div class="required field {{if .Err_HomeserverURL}}error{{end}}">
66
<label for="homeserver_url">{{.i18n.Tr "repo.settings.matrix.homeserver_url"}}</label>
7-
<input id="homeserver_url" name="homeserver_url" type="text" value="{{.MatrixHook.HomeserverURL}}" autofocus required>
7+
<input id="homeserver_url" name="homeserver_url" type="url" value="{{.MatrixHook.HomeserverURL}}" autofocus required>
88
</div>
99
<div class="required field {{if .Err_Room}}error{{end}}">
1010
<label for="room_id">{{.i18n.Tr "repo.settings.matrix.room_id"}}</label>

0 commit comments

Comments
 (0)