pub-solar/forgejo
5
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

when the update request doesn't intend to update attachments (eg: change checkbox state), ignore attachment updates (#16762)

Browse source
This commit is contained in:
wxiaoguang 2021-08-21 21:04:47 +08:00 committed by GitHub
parent 0bd58d61e5
commit 06f82641cb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
routers/web/repo/issue.go
View file

@ -1727,9 +1727,12 @@ func UpdateIssueContent(ctx *context.Context) {
return return
} }
if err := updateAttachments(issue, ctx.FormStrings("files[]")); err != nil { // when update the request doesn't intend to update attachments (eg: change checkbox state), ignore attachment updates
ctx.ServerError("UpdateAttachments", err) if !ctx.FormBool("ignore_attachments") {
return if err := updateAttachments(issue, ctx.FormStrings("files[]")); err != nil {
ctx.ServerError("UpdateAttachments", err)
return
}
} }
content, err := markdown.RenderString(&markup.RenderContext{ content, err := markdown.RenderString(&markup.RenderContext{
@ -2148,10 +2151,6 @@ func UpdateCommentContent(ctx *context.Context) {
return return
} }
if ctx.FormBool("ignore_attachments") {
return
}
if comment.Type == models.CommentTypeComment { if comment.Type == models.CommentTypeComment {
if err := comment.LoadAttachments(); err != nil { if err := comment.LoadAttachments(); err != nil {
ctx.ServerError("LoadAttachments", err) ctx.ServerError("LoadAttachments", err)
@ -2159,9 +2158,12 @@ func UpdateCommentContent(ctx *context.Context) {
} }
} }
if err := updateAttachments(comment, ctx.FormStrings("files[]")); err != nil { // when the update request doesn't intend to update attachments (eg: change checkbox state), ignore attachment updates
ctx.ServerError("UpdateAttachments", err) if !ctx.FormBool("ignore_attachments") {
return if err := updateAttachments(comment, ctx.FormStrings("files[]")); err != nil {
ctx.ServerError("UpdateAttachments", err)
return
}
} }
content, err := markdown.RenderString(&markup.RenderContext{ content, err := markdown.RenderString(&markup.RenderContext{