finn/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use fetch form action for lock/unlock/pin/unpin on sidebar (#25380)

Browse source 
Before:

<img width="364" alt="Screen Shot 2023-06-20 at 11 59 11"
src="ad284b7e-8d21-43be-b178-bbcfd37cb5bd">

Might trigger many posts when keep clicking the buttons above.

<img width="448" alt="Screen Shot 2023-06-20 at 11 52 28"
src="a60aa6ac-af74-45e4-b13a-512b436b81b0">
<img width="678" alt="Screen Shot 2023-06-20 at 11 52 37"
src="d6662700-3643-4cc7-a2ec-64e1c0f5fbdb">

After (PR sidebar, Same for issue):


9df3ad1f-e29c-439b-8bde-e6b917d63cc6

For delete, it is using `base/modal_actions_confirm` subtemplate, and we
might need another general solution for this (maybe add another
attribute to the subtemplate or something)

---------

Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: Giteabot <teabot@gitea.io>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
This commit is contained in:
HesterG 2023-06-29 12:16:04 +08:00 • committed by GitHub
parent f0b773e0ce
commit c6f1fb1c6d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

13
routers/web/repo/issue_lock.go
View file

@ -20,14 +20,12 @@ func LockIssue(ctx *context.Context) {
}
if issue.IsLocked {
ctx.Flash.Error(ctx.Tr("repo.issues.lock_duplicate"))
ctx.Redirect(issue.Link())
ctx.JSONError(ctx.Tr("repo.issues.lock_duplicate"))
return
}
if !form.HasValidReason() {
ctx.Flash.Error(ctx.Tr("repo.issues.lock.unknown_reason"))
ctx.Redirect(issue.Link())
ctx.JSONError(ctx.Tr("repo.issues.lock.unknown_reason"))
return
}
@ -40,7 +38,7 @@ func LockIssue(ctx *context.Context) {
return
}
ctx.Redirect(issue.Link())
ctx.JSONRedirect(issue.Link())
}
// UnlockIssue unlocks a previously locked issue.
@ -51,8 +49,7 @@ func UnlockIssue(ctx *context.Context) {
}
if !issue.IsLocked {
ctx.Flash.Error(ctx.Tr("repo.issues.unlock_error"))
ctx.Redirect(issue.Link())
ctx.JSONError(ctx.Tr("repo.issues.unlock_error"))
return
}
@ -64,5 +61,5 @@ func UnlockIssue(ctx *context.Context) {
return
}
ctx.Redirect(issue.Link())
ctx.JSONRedirect(issue.Link())
}

2
routers/web/repo/issue_pin.go
View file

@ -31,7 +31,7 @@ func IssuePinOrUnpin(ctx *context.Context) {
return
}
ctx.Redirect(issue.Link())
ctx.JSONRedirect(issue.Link())
}
// IssueUnpin unpins a Issue