Set correct content_type value for Gogs/Gitea webhooks (#9504) #10456
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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}}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}} | ||
|
There was a problem hiding this comment. My editor respected the There was a problem hiding this comment. Reminds me we still need to reformat the codebase to conform |
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why change ContentType for gitea too?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The same problem occurs with the Gitea webhook if you don't select a ContentType from the drop down. The intention of the template seemed to be to populate a working value in the form as a default, but that's not what's happening.