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]>

templates/repo/settings/webhook/gitea.tmpl

@@ -1,40 +1,40 @@
-{{if eq .HookType "gitea"}}
- <p>{{.i18n.Tr "repo.settings.add_webhook_desc" "https://docs.gitea.io/en-us/webhooks/" | Str2html}}</p>
- <form class="ui form" action="{{.BaseLink}}/gitea/{{or .Webhook.ID "new"}}" method="post">
- {{.CsrfTokenHtml}}
- <div class="required field {{if .Err_PayloadURL}}error{{end}}">
- <label for="payload_url">{{.i18n.Tr "repo.settings.payload_url"}}</label>
- <input id="payload_url" name="payload_url" type="url" value="{{.Webhook.URL}}" autofocus required>
- </div>
- <div class="field">
- <label>{{.i18n.Tr "repo.settings.http_method"}}</label>
- <div class="ui selection dropdown">
- <input type="hidden" id="http_method" name="http_method" value="{{if .Webhook.HTTPMethod}}{{.Webhook.HTTPMethod}}{{else}}POST{{end}}">
- <div class="default text"></div>
- <i class="dropdown icon"></i>
- <div class="menu">
- <div class="item" data-value="POST">POST</div>
- <div class="item" data-value="GET">GET</div>
- </div>
- </div>
- </div>
- <div class="field">
- <label>{{.i18n.Tr "repo.settings.content_type"}}</label>
- <div class="ui selection dropdown">
- <input type="hidden" id="content_type" name="content_type" value="{{if .Webhook.ContentType}}{{.Webhook.ContentType}}{{else}}application/json{{end}}">
- <div class="default text"></div>
- <i class="dropdown icon"></i>
- <div class="menu">
- <div class="item" data-value="1">application/json</div>
- <div class="item" data-value="2">application/x-www-form-urlencoded</div>
- </div>
- </div>
- </div>
- <input class="fake" type="password">
- <div class="field {{if .Err_Secret}}error{{end}}">
- <label for="secret">{{.i18n.Tr "repo.settings.secret"}}</label>
- <input id="secret" name="secret" type="password" value="{{.Webhook.Secret}}" autocomplete="off">
- </div>
- {{template "repo/settings/webhook/settings" .}}
- </form>
-{{end}}
+{{if eq .HookType "gitea"}}
+ <p>{{.i18n.Tr "repo.settings.add_webhook_desc" "https://docs.gitea.io/en-us/webhooks/" | Str2html}}</p>
+ <form class="ui form" action="{{.BaseLink}}/gitea/{{or .Webhook.ID "new"}}" method="post">
+ {{.CsrfTokenHtml}}
+ <div class="required field {{if .Err_PayloadURL}}error{{end}}">
+ <label for="payload_url">{{.i18n.Tr "repo.settings.payload_url"}}</label>
+ <input id="payload_url" name="payload_url" type="url" value="{{.Webhook.URL}}" autofocus required>
+ </div>
+ <div class="field">
+ <label>{{.i18n.Tr "repo.settings.http_method"}}</label>
+ <div class="ui selection dropdown">
+ <input type="hidden" id="http_method" name="http_method" value="{{if .Webhook.HTTPMethod}}{{.Webhook.HTTPMethod}}{{else}}POST{{end}}">
+ <div class="default text"></div>
+ <i class="dropdown icon"></i>
+ <div class="menu">
+ <div class="item" data-value="POST">POST</div>
+ <div class="item" data-value="GET">GET</div>
+ </div>
+ </div>
+ </div>
+ <div class="field">
+ <label>{{.i18n.Tr "repo.settings.content_type"}}</label>
+ <div class="ui selection dropdown">
+ <input type="hidden" id="content_type" name="content_type" value="{{if .Webhook.ContentType}}{{.Webhook.ContentType}}{{else}}1{{end}}">
+ <div class="default text"></div>
+ <i class="dropdown icon"></i>
+ <div class="menu">
+ <div class="item" data-value="1">application/json</div>
+ <div class="item" data-value="2">application/x-www-form-urlencoded</div>
+ </div>
+ </div>
+ </div>
+ <input class="fake" type="password">
+ <div class="field {{if .Err_Secret}}error{{end}}">
+ <label for="secret">{{.i18n.Tr "repo.settings.secret"}}</label>
+ <input id="secret" name="secret" type="password" value="{{.Webhook.Secret}}" autocomplete="off">
+ </div>
+ {{template "repo/settings/webhook/settings" .}}
+ </form>
+{{end}}

templates/repo/settings/webhook/gogs.tmpl

@@ -9,7 +9,7 @@
  <div class="field">
  <label>{{.i18n.Tr "repo.settings.content_type"}}</label>
  <div class="ui selection dropdown">
- <input type="hidden" id="content_type" name="content_type" value="{{if .Webhook.ContentType}}{{.Webhook.ContentType}}{{else}}application/json{{end}}">
+ <input type="hidden" id="content_type" name="content_type" value="{{if .Webhook.ContentType}}{{.Webhook.ContentType}}{{else}}1{{end}}">
  <div class="default text"></div>
  <i class="dropdown icon"></i>
  <div class="menu">