core
/
gitea
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move POST /{username}/action/{action} to simply POST /{username} (#18045) 

The current code unfortunately requires that `action` be a reserved
repository name as it prevents posts to change the settings for
action repositories. However, we can simply change action handler
to work on POST /{username} instead.

Fix #18037

Signed-off-by: Andrew Thornton <art27@cantab.net>
This commit is contained in:
zeripath 2021-12-20 17:18:26 +00:00 committed by GitHub
parent ce840bb177
commit 0ac845042e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
routers/web/user/profile.go
View File

@ -363,7 +363,7 @@ func Action(ctx *context.Context) {
} }
var err error var err error
switch ctx.Params(":action") { switch ctx.FormString("action") {
case "follow": case "follow":
err = user_model.FollowUser(ctx.User.ID, u.ID) err = user_model.FollowUser(ctx.User.ID, u.ID)
case "unfollow": case "unfollow":
@ -371,7 +371,7 @@ func Action(ctx *context.Context) {
} }
if err != nil { if err != nil {
ctx.ServerError(fmt.Sprintf("Action (%s)", ctx.Params(":action")), err) ctx.ServerError(fmt.Sprintf("Action (%s)", ctx.FormString("action")), err)
return return
} }
// FIXME: We should check this URL and make sure that it's a valid Gitea URL // FIXME: We should check this URL and make sure that it's a valid Gitea URL

4
routers/web/web.go
View File

@ -484,9 +484,7 @@ func RegisterRoutes(m *web.Route) {
m.Get("/attachments/{uuid}", repo.GetAttachment) m.Get("/attachments/{uuid}", repo.GetAttachment)
}, ignSignIn) }, ignSignIn)
m.Group("/{username}", func() { m.Post("/{username}", reqSignIn, user.Action)
m.Post("/action/{action}", user.Action)
}, reqSignIn)
if !setting.IsProd { if !setting.IsProd {
m.Get("/template/*", dev.TemplatePreview) m.Get("/template/*", dev.TemplatePreview)

4
templates/user/profile.tmpl
View File

@ -66,12 +66,12 @@
{{if and .IsSigned (ne .SignedUserName .Owner.Name)}} {{if and .IsSigned (ne .SignedUserName .Owner.Name)}}
<li class="follow"> <li class="follow">
{{if $.IsFollowing}} {{if $.IsFollowing}}
<form method="post" action="{{.Link}}/action/unfollow?redirect_to={{$.Link}}"> <form method="post" action="{{.Link}}?action=unfollow&redirect_to={{$.Link}}">
{{$.CsrfTokenHtml}} {{$.CsrfTokenHtml}}
<button type="submit" class="ui basic red button">{{svg "octicon-person"}} {{.i18n.Tr "user.unfollow"}}</button> <button type="submit" class="ui basic red button">{{svg "octicon-person"}} {{.i18n.Tr "user.unfollow"}}</button>
</form> </form>
{{else}} {{else}}
<form method="post" action="{{.Link}}/action/follow?redirect_to={{$.Link}}"> <form method="post" action="{{.Link}}?action=follow&redirect_to={{$.Link}}">
{{$.CsrfTokenHtml}} {{$.CsrfTokenHtml}}
<button type="submit" class="ui basic green button">{{svg "octicon-person"}} {{.i18n.Tr "user.follow"}}</button> <button type="submit" class="ui basic green button">{{svg "octicon-person"}} {{.i18n.Tr "user.follow"}}</button>
</form> </form>