troldspejlet/forgejo
troldspejlet/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-27 12:53:57 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Keep attachments on tasklist update (#16750)

Browse source 
* Send attachments too.

* Use tasklist flag.

* use action="ignoreAttachments" instead of "tasklist"

* Use boolean parameter.

Co-authored-by: zeripath <art27@cantab.net>
This commit is contained in:
KN4CK3R 2021-08-20 21:26:19 +02:00 committed by GitHub
parent 3b2ed4762e
commit dc2613600c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2127,13 +2127,6 @@ func UpdateCommentContent(ctx *context.Context) {
return return
} }
if comment.Type == models.CommentTypeComment {
if err := comment.LoadAttachments(); err != nil {
ctx.ServerError("LoadAttachments", err)
return
}
}
if !ctx.IsSigned || (ctx.User.ID != comment.PosterID && !ctx.Repo.CanWriteIssuesOrPulls(comment.Issue.IsPull)) { if !ctx.IsSigned || (ctx.User.ID != comment.PosterID && !ctx.Repo.CanWriteIssuesOrPulls(comment.Issue.IsPull)) {
ctx.Error(http.StatusForbidden) ctx.Error(http.StatusForbidden)
return return
@ -2155,6 +2148,17 @@ func UpdateCommentContent(ctx *context.Context) {
return return
} }
if ctx.FormBool("ignore_attachments") {
return
}
if comment.Type == models.CommentTypeComment {
if err := comment.LoadAttachments(); err != nil {
ctx.ServerError("LoadAttachments", err)
return
}
}
if err := updateAttachments(comment, ctx.FormStrings("files[]")); err != nil { if err := updateAttachments(comment, ctx.FormStrings("files[]")); err != nil {
ctx.ServerError("UpdateAttachments", err) ctx.ServerError("UpdateAttachments", err)
return return

3
web_src/js/markup/tasklist.js
View file

@ -46,9 +46,10 @@ export function initMarkupTasklist() {
const {updateUrl, context} = editContentZone.dataset; const {updateUrl, context} = editContentZone.dataset;
await $.post(updateUrl, { await $.post(updateUrl, {
ignore_attachments: true,
_csrf: window.config.csrf, _csrf: window.config.csrf,
content: newContent, content: newContent,
context, context
}); });
rawContent.textContent = newContent; rawContent.textContent = newContent;