Skip to content

Commit 2cb3db2

Browse files
zeripathjvstein
zeripath
and
jvstein
authored
Set correct content_type value for Gogs/Gitea webhooks (#9504) (#10456) (#11461)
The content_type value was defaulting to the string value of the ContentType, not the integer value as expected by the backend. Co-authored-by: Jeff Stein <[email protected]>
1 parent 04e480d commit 2cb3db2

File tree

2 files changed

+41
-41
lines changed

2 files changed

+41
-41
lines changed

‎templates/repo/settings/webhook/gitea.tmpl

+40-40
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,40 @@
1-
{{if eq .HookType "gitea"}}
2-
<p>{{.i18n.Tr "repo.settings.add_webhook_desc" "https://docs.gitea.io/en-us/webhooks/" | Str2html}}</p>
3-
<form class="ui form" action="{{.BaseLink}}/gitea/{{or .Webhook.ID "new"}}" method="post">
4-
{{.CsrfTokenHtml}}
5-
<div class="required field {{if .Err_PayloadURL}}error{{end}}">
6-
<label for="payload_url">{{.i18n.Tr "repo.settings.payload_url"}}</label>
7-
<input id="payload_url" name="payload_url" type="url" value="{{.Webhook.URL}}" autofocus required>
8-
</div>
9-
<div class="field">
10-
<label>{{.i18n.Tr "repo.settings.http_method"}}</label>
11-
<div class="ui selection dropdown">
12-
<input type="hidden" id="http_method" name="http_method" value="{{if .Webhook.HTTPMethod}}{{.Webhook.HTTPMethod}}{{else}}POST{{end}}">
13-
<div class="default text"></div>
14-
<i class="dropdown icon"></i>
15-
<div class="menu">
16-
<div class="item" data-value="POST">POST</div>
17-
<div class="item" data-value="GET">GET</div>
18-
</div>
19-
</div>
20-
</div>
21-
<div class="field">
22-
<label>{{.i18n.Tr "repo.settings.content_type"}}</label>
23-
<div class="ui selection dropdown">
24-
<input type="hidden" id="content_type" name="content_type" value="{{if .Webhook.ContentType}}{{.Webhook.ContentType}}{{else}}application/json{{end}}">
25-
<div class="default text"></div>
26-
<i class="dropdown icon"></i>
27-
<div class="menu">
28-
<div class="item" data-value="1">application/json</div>
29-
<div class="item" data-value="2">application/x-www-form-urlencoded</div>
30-
</div>
31-
</div>
32-
</div>
33-
<input class="fake" type="password">
34-
<div class="field {{if .Err_Secret}}error{{end}}">
35-
<label for="secret">{{.i18n.Tr "repo.settings.secret"}}</label>
36-
<input id="secret" name="secret" type="password" value="{{.Webhook.Secret}}" autocomplete="off">
37-
</div>
38-
{{template "repo/settings/webhook/settings" .}}
39-
</form>
40-
{{end}}
1+
{{if eq .HookType "gitea"}}
2+
<p>{{.i18n.Tr "repo.settings.add_webhook_desc" "https://docs.gitea.io/en-us/webhooks/" | Str2html}}</p>
3+
<form class="ui form" action="{{.BaseLink}}/gitea/{{or .Webhook.ID "new"}}" method="post">
4+
{{.CsrfTokenHtml}}
5+
<div class="required field {{if .Err_PayloadURL}}error{{end}}">
6+
<label for="payload_url">{{.i18n.Tr "repo.settings.payload_url"}}</label>
7+
<input id="payload_url" name="payload_url" type="url" value="{{.Webhook.URL}}" autofocus required>
8+
</div>
9+
<div class="field">
10+
<label>{{.i18n.Tr "repo.settings.http_method"}}</label>
11+
<div class="ui selection dropdown">
12+
<input type="hidden" id="http_method" name="http_method" value="{{if .Webhook.HTTPMethod}}{{.Webhook.HTTPMethod}}{{else}}POST{{end}}">
13+
<div class="default text"></div>
14+
<i class="dropdown icon"></i>
15+
<div class="menu">
16+
<div class="item" data-value="POST">POST</div>
17+
<div class="item" data-value="GET">GET</div>
18+
</div>
19+
</div>
20+
</div>
21+
<div class="field">
22+
<label>{{.i18n.Tr "repo.settings.content_type"}}</label>
23+
<div class="ui selection dropdown">
24+
<input type="hidden" id="content_type" name="content_type" value="{{if .Webhook.ContentType}}{{.Webhook.ContentType}}{{else}}1{{end}}">
25+
<div class="default text"></div>
26+
<i class="dropdown icon"></i>
27+
<div class="menu">
28+
<div class="item" data-value="1">application/json</div>
29+
<div class="item" data-value="2">application/x-www-form-urlencoded</div>
30+
</div>
31+
</div>
32+
</div>
33+
<input class="fake" type="password">
34+
<div class="field {{if .Err_Secret}}error{{end}}">
35+
<label for="secret">{{.i18n.Tr "repo.settings.secret"}}</label>
36+
<input id="secret" name="secret" type="password" value="{{.Webhook.Secret}}" autocomplete="off">
37+
</div>
38+
{{template "repo/settings/webhook/settings" .}}
39+
</form>
40+
{{end}}

‎templates/repo/settings/webhook/gogs.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<div class="field">
1010
<label>{{.i18n.Tr "repo.settings.content_type"}}</label>
1111
<div class="ui selection dropdown">
12-
<input type="hidden" id="content_type" name="content_type" value="{{if .Webhook.ContentType}}{{.Webhook.ContentType}}{{else}}application/json{{end}}">
12+
<input type="hidden" id="content_type" name="content_type" value="{{if .Webhook.ContentType}}{{.Webhook.ContentType}}{{else}}1{{end}}">
1313
<div class="default text"></div>
1414
<i class="dropdown icon"></i>
1515
<div class="menu">

0 commit comments

Comments
 (0)